opensupports/server/controllers
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 Guillermo - disable-user-system [skip ci] 2017-01-16 16:07:53 -03:00
staff Ivan - Deploy changes [skip ci] 2017-01-11 00:21:27 -03:00
system Merge branch 'master' into OS156-Disable-user-system 2017-01-17 15:03:48 -03:00
ticket Merge branch 'master' into OS156-Disable-user-system 2017-01-17 15:03:48 -03:00
user Merge branch 'master' into OS156-Disable-user-system 2017-01-17 15:03:48 -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 OS156-Disable-user-system 2017-01-17 15:03:48 -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