Merge branch 'electron' of https://github.com/aviraldg/vector-web into aviraldg-electron

This commit is contained in:
David Baker 2016-10-19 14:14:35 +01:00
commit 976c20a2f7
9 changed files with 173 additions and 7 deletions

2
.gitignore vendored
View file

@ -5,8 +5,10 @@
/node_modules
/packages/
/vector/bundle.*
/vector/electron-main.*
/vector/components.css
/vector/emojione/
/vector/electron/
/vector/config.json
/vector/olm.js
.DS_Store