AntonyAntonio 35ac87ab88 Merge branch 'master' into OS156-Disable-user-system ... Conflicts: server/controllers/system.php tests/init.rb		2017-01-17 15:03:48 -03:00
..
article	…
staff	…
system	Merge branch 'master' into OS156-Disable-user-system	2017-01-17 15:03:48 -03:00
ticket	Ivan - Add Database Backup, FileDownloader, FileUploader and LinearCongruentialGenerator classes [skip ci]	2017-01-12 16:45:01 -03:00
user	Ivan - Add deploy on dev 3 changes and fixes [skip ci]	2017-01-10 17:07:49 -03:00
Gemfile	…
clean_db.sh	…
init.rb	Merge branch 'master' into OS156-Disable-user-system	2017-01-17 15:03:48 -03:00
libs.rb	Ivan - Add file upload and download test [skip ci]	2017-01-13 21:58:59 -03:00
run-tests.sh	…
scripts.rb	Guillermo - registration api keys [skip ci]	2017-01-13 17:06:49 -03:00