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
..
controllers	Merge branch 'master' of https://bitbucket.org/ivandiazwm/os4-react	2017-01-11 03:50:47 -03:00
data	Ivan - Add deploy on dev 3 changes and fixes [skip ci]	2017-01-10 17:07:49 -03:00
libs	Ivan - Add deploy on dev 3 changes and fixes [skip ci]	2017-01-10 17:07:49 -03:00
models	Ivan - Add deploy on dev 3 changes and fixes [skip ci]	2017-01-10 17:07:49 -03:00
tests	Ivan - STAFF LOGIN - Add Staff login to backend [skip ci]	2016-09-25 01:16:10 -03:00
composer.json	Ivan - Update redbean version to support php7 [skip ci]	2016-12-24 16:53:33 -03:00
config.php	[Ivan Diaz] -Add default values if environment variables are not defined	2016-05-14 15:32:44 -03:00
index.php	Ivan - Add CustomResponse model and paths [skip ci]	2016-10-03 16:44:41 -03:00
run-tests.sh	Ivan - Backend - Add unit test for captcha validation [skip ci]	2016-08-20 19:19:18 -03:00