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
..
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-144Stats-Architecture	2017-01-12 17:10:37 -03:00
ticket	Max Red - Finally we did it! [skip ci]	2017-01-05 18:01:56 -03:00
user	Merge branch 'master' of https://bitbucket.org/ivandiazwm/os4-react	2017-01-11 03:50:47 -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-144Stats-Architecture	2017-01-12 17:10:37 -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