opensupports/server
AntonyAntonio 8763264a01 Merge branch 'master' into OS-144Stats-Architecture
Conflicts:
	server/controllers/system.php
	server/controllers/system/init-settings.php
	tests/init.rb
2017-01-12 17:10:37 -03:00
..
controllers Merge branch 'master' into OS-144Stats-Architecture 2017-01-12 17:10:37 -03:00
data Guillermo - stats architecture [skip ci] 2017-01-12 02:50:45 -03:00
libs Guillermo - stats architecture [skip ci] 2017-01-12 16:30:58 -03:00
models Guillermo - stats architecture [skip ci] 2017-01-12 02:50:45 -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