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

2017-05-19 01:15:31 +01:00
parent 7777be89ee b886215fdd
commit eaeac1230f
311 changed files with 674 additions and 720 deletions
@@ -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