AntonyAntonio e317bbea38 Merge branch 'master' into OS141create-Log-Architectur ... Conflicts: server/controllers/staff/delete.php tests/system/edit-settings.rb		2016-12-29 18:54:17 -03:00
..
controllers	Merge branch 'master' into OS141create-Log-Architectur	2016-12-29 18:54:17 -03:00
data	Guillermo - add path /user/verify [skip ci]	2016-12-23 01:56:01 -03:00
libs	Merged in OS-168-update-dates (pull request #97)	2016-12-13 22:06:58 -03:00
models	Merge branch 'master' into OS141create-Log-Architectur	2016-12-29 18:54:17 -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