Lajellu 1f114eb908 Merge remote-tracking branch 'origin/EmojiReworked' into EmojiReworked		2016-10-06 13:44:03 -07:00
..
api	omit hiredis package; cleanup	2016-08-29 21:34:03 +00:00
locales	Merge branch 'EmojiReworked' of github.com:lajellu/bigbluebutton into merge-pr	2016-09-28 23:47:28 +00:00
startup	HTML5 - adds Emoji showing up on user list	2016-09-26 13:29:44 -07:00
ui	Merge remote-tracking branch 'origin/EmojiReworked' into EmojiReworked	2016-10-06 13:44:03 -07:00
utils	HTML5 - changes status names, and user list sorting logic to match flash client	2016-10-06 13:42:37 -07:00