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

This commit is contained in:
Weblate 2017-03-14 13:29:22 +01:00
commit 79cd983170
2 changed files with 2580 additions and 1 deletions

1
.gitignore vendored
View File

@ -49,5 +49,4 @@ phpunit.xml
# Ant cache
cache.properties
# Composer
composer.lock
/vendor/

2580
composer.lock generated Normal file

File diff suppressed because it is too large Load Diff