Merge branch 'develop' into rav/webpack_olm

2016-10-26 15:13:57 +01:00
parent fcf683c8a7 8fe05fdff3
commit 53e5894759
3 changed files with 7 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/build
 /cert.pem
 /karma-reports
 /key.pem
@@ -5,7 +6,6 @@
 /node_modules
 /packages/
 /vector/bundle.*
-/vector/components.css
 /vector/emojione/
 /vector/config.json
 /vector/olm.*