Commit Graph

209 Commits

Author SHA1 Message Date
Matthew Hodgson
4fbf34e05b Merge branch 'develop' into matthew/dharma 2018-08-03 17:15:00 -07:00
David Baker
b5d2fa769c Support MAU error on sync
For https://github.com/vector-im/riot-web/issues/7091
2018-08-03 14:54:52 +01:00
Matthew Hodgson
9783b6100d Merge branch 'develop' into matthew/dharma 2018-07-29 17:03:23 +01:00
Michael Telatynski
32ab997230
properly style Group Pill
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 14:38:06 +01:00
Matthew Hodgson
3bf28a08ec experiments in dharma 2018-05-25 03:17:29 +01:00
Matthew Hodgson
6d1563449d fix missing NLs 2018-04-17 16:57:08 +01:00
Matthew Hodgson
46f5c0d205 finish merging vector-im/riot-web#5881 into matrix-react-sdk 2018-04-16 01:13:03 +01:00
Matthew Hodgson
5f3e4444d0 fix theme paths 2018-04-13 01:25:34 +01:00
Matthew Hodgson
cdb5d489a4 organise themes (even light & dark) in the SDK layer 2018-04-12 00:24:22 +01:00