Merge branch 'develop' of github.com:vector-im/riot-web into forward_message

This commit is contained in:
Michael Telatynski 2017-05-19 01:15:31 +01:00
commit eaeac1230f
311 changed files with 674 additions and 720 deletions

2
.gitignore vendored
View file

@ -5,6 +5,7 @@
/key.pem
/lib
/node_modules
/electron/node_modules
/packages/
/webapp
/.npmrc
@ -14,3 +15,4 @@ electron/dist
electron/pub
/.idea
/config.json
/src/component-index.js