Cain Kilgore f79a8b3cb5 Merge branch 'master' of https://github.com/highfidelity/hifi into chat-char-limit		2017-08-04 23:34:44 +01:00
..
css	Merge pull request #10541 from Menithal/21324	2017-06-13 13:00:54 -07:00
img	Merge pull request #10600 from seefo/snapshot	2017-06-07 17:05:29 -07:00
js	Merge pull request #11061 from TurnMeUp-OG/21470	2017-08-01 15:10:26 -07:00
ChatPage.html	Limited Max Length of the Chat Box to 256 - as this exceeds Message. max.	2017-08-04 23:25:26 +01:00
entityList.html	increment colspan count in table footer	2017-04-20 15:20:48 -07:00
entityProperties.html	Add circle and cone to entity shape list	2017-05-31 16:25:11 -07:00
gridControls.html	Raise and lower keyboard in entities editor	2016-09-28 17:57:53 +13:00
marketplaces.html	No custom styling of marketplaces directory scrollbar	2017-03-30 14:38:17 +13:00
SnapshotReview.html	Cleaned up Polaroid code	2017-06-02 11:02:01 -07:00
users.html	simpler filter code	2017-02-15 10:23:36 -08:00