mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
Merge branch 'unstable' of github.com:yunohost-bot/yunohost into unstable
Conflicts: locales/es.json locales/fr.json
This commit is contained in:
commit
48852c4b99