Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-08-03 08:14:30 +00:00
commit 45b180e476
2 changed files with 3 additions and 6960 deletions

3
.gitignore vendored
View File

@ -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

File diff suppressed because it is too large Load Diff