Commit Graph

7 Commits

Author SHA1 Message Date
AntonyAntonio 7a6eccb1bd Merge branch 'DataAPI' 2017-04-21 22:41:29 -03:00
AntonyAntonio ce63b407e0 Guillermo - things [skip ci] 2017-04-21 03:09:24 -03:00
AntonyAntonio e3683ba1a4 Guillermo - data system [skip ci] 2017-04-17 21:09:16 -03:00
ivan 892e1536a2 Ivan - Fix installation in subfolder and file permissions 2017-04-10 22:30:39 -03:00
ivan 6f1638e5fe Ivan - Update backend methods [skip ci] 2017-02-08 15:09:15 -03:00
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