mirror of
https://github.com/element-hq/element-web.git
synced 2024-11-30 23:31:28 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
45b180e476
2 changed files with 3 additions and 6960 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -14,3 +14,6 @@ npm-debug.log
|
|||
/src/component-index.js
|
||||
|
||||
.DS_Store
|
||||
|
||||
# https://github.com/vector-im/riot-web/issues/7083
|
||||
package-lock.json
|
||||
|
|
6960
package-lock.json
generated
6960
package-lock.json
generated
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue