ivan a7ef5c10f2 Merge branch 'master' into OS4#150Enable-registration
# Conflicts:
#	server/controllers/system/get-settings.php
2017-01-11 03:49:32 -03:00
..