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
..
add-department.php	Guillermo - add creatae log architecture [skip ci]	2016-12-28 21:55:00 -03:00
delete-department.php	Guillermo - add creatae log architecture [skip ci]	2016-12-28 21:55:00 -03:00
edit-department.php	Guillermo - add creatae log architecture [skip ci]	2016-12-28 21:55:00 -03:00
edit-mail-template.php	Guillermo - path edit/recover-mail-templates [skip ci]	2017-01-03 20:35:46 -03:00
edit-settings.php	Ivan - Update settings values [skip ci]	2017-01-04 19:29:23 -03:00
get-logs.php	Ivan Diaz - update backend logs [skip ci]	2017-01-05 16:26:43 -03:00
get-mail-templates.php	Guillermo - path get-mail-templates [skip ci]	2017-01-03 19:36:26 -03:00
get-settings.php	Ivan - Update settings values [skip ci]	2017-01-04 19:29:23 -03:00
init-settings.php	Ivan - Update settings values [skip ci]	2017-01-04 19:29:23 -03:00
recover-mail-template.php	Guillermo - path edit/recover-mail-templates [skip ci]	2017-01-03 20:35:46 -03:00