Merge branch 'unstable' of github.com:yunohost-bot/yunohost into unstable

Conflicts:
	locales/es.json
	locales/fr.json
This commit is contained in:
Weblate 2017-02-01 21:12:28 +01:00
commit 48852c4b99

Diff content is not available