102 Commits (cabbd16dd3c8399a0f111b674aa6a6bc32dc4888)

Author	SHA1	Message	Date
David Baker	c15a66d1d4	Fix up notification settings strings	2017-05-25 17:21:41 +01:00
David Baker	6b6fa59f3e	Squash merge https://github.com/vector-im/riot-web/pull/3636	2017-05-23 14:12:53 +01:00