Merge branch 'develop' into hosting_i18n

This commit is contained in:
modulos 2017-05-29 15:37:30 +02:00
commit 40fe3f4d29
7 changed files with 61 additions and 21 deletions