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

This commit is contained in:
Weblate 2015-11-15 00:23:08 +01:00
commit ae0d4b537b

2
.gitignore vendored
View file

@ -31,4 +31,4 @@ pip-log.txt
.mr.developer.cfg
# moulinette lib
lib/yunohost/locales
src/yunohost/locales