Matthew Hodgson 721410b710 Merge branch 'develop' into matthew/slate		2018-05-13 19:50:55 +01:00
..
avatars	tell eslint to ignore viewAvatarOnClick being unused	2018-05-06 00:22:14 +01:00
context_menus	improve wording	2018-04-27 11:26:42 +01:00
create_room	Remove use of deprecated React.PropTypes	2017-12-26 14:03:18 +13:00
dialogs	Merge pull request #1866 from matrix-org/luke/luke/group-store-refactor	2018-05-01 12:33:06 +01:00
directory	point imports at the new locations	2018-04-13 00:43:44 +01:00
elements	Merge pull request #1889 from matrix-org/t3chguy/replies-html-tag	2018-05-12 20:22:54 +01:00
globals	Add comment about enum hijinks	2018-04-17 16:53:11 +01:00
groups	Remove GroupStore listener when unmounting GroupPublicityToggle	2018-05-01 11:50:14 +01:00
login	fix paths and updateCheckStatusEnum	2018-04-13 16:49:59 +01:00
messages	blind fix to the overlapping sticker bug	2018-05-08 09:50:06 +01:00
room_settings	guard against m.room.aliases events with no keys (redaction?)	2018-02-02 08:12:56 +00:00
rooms	Merge branch 'develop' into matthew/slate	2018-05-13 19:50:55 +01:00
settings	point imports at the new locations	2018-04-13 00:43:44 +01:00
voip	missing semicolon	2018-02-07 11:51:41 +00:00