opensupports/server/controllers
Ivan Diaz 7b95c54257 Merge branch 'master' into os-147-151-file-architecture-and-backup
Conflicts:
	server/controllers/system.php
	server/data/ERRORS.php
	tests/init.rb
2017-01-14 21:45:43 -03:00
..
article Guillermo - add creatae log architecture [skip ci] 2016-12-28 21:55:00 -03:00
staff Ivan - Deploy changes [skip ci] 2017-01-11 00:21:27 -03:00
system Merge branch 'master' into os-147-151-file-architecture-and-backup 2017-01-14 21:45:43 -03:00
ticket Ivan - Add validations before download and upload on comment [skip ci] 2017-01-12 20:31:12 -03:00
user Guillermo - registration api keys [skip ci] 2017-01-13 17:06:49 -03:00
article.php Ivan - Add articles paths [skip ci] 2016-11-22 22:27:05 -03:00
staff.php Guillermo - path and tests staff/last-events [skip ci] 2017-01-03 18:52:18 -03:00
system.php Merge branch 'master' into os-147-151-file-architecture-and-backup 2017-01-14 21:45:43 -03:00
ticket.php GuilleSabe-ticket-seen[skip ci] 2016-10-20 18:34:06 -03:00
user.php Guillermo - add path /user/verify [skip ci] 2016-12-22 03:07:06 -03:00