Commit Graph

2 Commits

Author SHA1 Message Date
ivan 9383fd0d3e Merge branch 'master' of https://bitbucket.org/ivandiazwm/os4-react
# Conflicts:
#	server/controllers/system/get-settings.php
2017-01-11 03:50:47 -03:00
AntonyAntonio a317f6a29c Guillermo - paths enable/disable registration[skip ci] 2017-01-10 15:22:36 -03:00