mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
ed9a4a3933
2
.gitignore
vendored
2
.gitignore
vendored
@ -14,6 +14,6 @@
|
|||||||
npm-debug.log
|
npm-debug.log
|
||||||
electron/dist
|
electron/dist
|
||||||
electron/pub
|
electron/pub
|
||||||
/.idea
|
**/.idea
|
||||||
/config.json
|
/config.json
|
||||||
/src/component-index.js
|
/src/component-index.js
|
||||||
|
Loading…
Reference in New Issue
Block a user