Travis Ralston 69939e2fe3 Merge branch 'develop' into travis/granular		2017-11-03 21:56:46 -06:00
..
context_menus	Use granular settings instead of synced settings	2017-10-29 01:51:02 -06:00
dialogs	Devtools styling tweaks	2017-10-30 13:32:31 +00:00
directory	Sorting of networks within a protocol based on name	2017-05-27 19:10:17 +01:00
elements	Add toggle to alter visibility of room-group association	2017-11-02 13:40:07 +00:00
globals	un-i18n Modal Analytics	2017-07-27 17:45:02 +01:00
login	Custom server text was i18ned by key	2017-10-20 13:48:00 +01:00
messages	Revert "Implement sticky date separators"	2017-09-06 17:36:43 +01:00
rooms	Move the PinnedEventsPanel to the react-sdk	2017-09-29 13:15:21 -06:00
settings	Merge pull request #5453 from VickyKoblinski/es6-notifications	2017-10-27 09:15:22 +01:00