Commit graph

4 commits

Author SHA1 Message Date
David Baker
7d161de35b Partial merge of develop to experimental
Does not include #2336 as the file has been moved out from underneath it:
will do this separately
2019-01-03 15:02:58 +00:00
Aaron Raimist
6d8649855a
Fix lint errors in VectorPushRulesDefinitions.js
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-11 21:59:20 -05:00
Matthew Hodgson
40a67ca8fe point imports at the new locations 2018-04-13 00:43:44 +01:00
Matthew Hodgson
178fb647ad move notifications logic over from riot-web 2018-04-11 23:58:37 +01:00