Merge branch 'develop' into rav/webpack_olm
This commit is contained in:
commit
53e5894759
3 changed files with 7 additions and 6 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -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.*
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue