ivan 1465a53616 Merge branch 'master' into os-143-last-activity ... # Conflicts: # client/src/data/languages/en.js		2017-01-05 16:27:19 -03:00
..
article	Guillermo - add creatae log architecture [skip ci]	2016-12-28 21:55:00 -03:00
staff	Guillermo - path and tests staff/last-events [skip ci]	2017-01-03 18:52:18 -03:00
system	Merge branch 'master' into os-143-last-activity	2017-01-05 16:27:19 -03:00
ticket	Ivan Diaz - update backend logs [skip ci]	2017-01-05 16:26:43 -03:00
user	Ivan Diaz - update backend logs [skip ci]	2017-01-05 16:26:43 -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	Guillermo - path edit/recover-mail-templates [skip ci]	2017-01-03 20:35:46 -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