Luke Barnard bf77b51b5e Merge branch 'develop' into luke/groups-room-publicity		2017-11-02 13:39:33 +00:00
..
avatars	Fix some react warnings firing	2017-11-01 17:12:22 +00:00
create_room	Run eslint --fix	2017-10-11 17:56:17 +01:00
dialogs	Fix merge conflict	2017-11-01 15:50:45 +01:00
elements	Fix merge conflict	2017-10-25 18:19:27 +02:00
groups	Merge branch 'develop' into luke/groups-room-publicity	2017-11-02 13:39:33 +00:00
login	Fix italics and parens	2017-10-15 18:01:57 +02:00
messages	Merge branch 'develop' into departify	2017-10-27 19:23:13 +02:00
room_settings	canSetRelatedRooms -> canSetRelatedGroups	2017-10-24 17:57:26 +01:00
rooms	Merge branch 'develop' into luke/groups-room-info	2017-11-02 10:56:33 +00:00
settings	Don't refresh page on password change prompt	2017-10-30 16:28:27 +00:00
voip	Default to false	2017-10-26 10:06:04 +01:00