ivan a7ef5c10f2 Merge branch 'master' into OS4#150Enable-registration ... # Conflicts: # server/controllers/system/get-settings.php		2017-01-11 03:49:32 -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
disable-registration.php	Guillermo - paths enable/disable registration[skip ci]	2017-01-10 15:22:36 -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
enable-registration.php	Guillermo - paths enable/disable registration[skip ci]	2017-01-10 15:22:36 -03:00
get-logs.php	Ivan - Deploy changes [skip ci]	2017-01-11 00:21:27 -03:00
get-mail-templates.php	Guillermo - path get-mail-templates [skip ci]	2017-01-03 19:36:26 -03:00
get-settings.php	Merge branch 'master' into OS4#150Enable-registration	2017-01-11 03:49:32 -03:00
init-settings.php	Guillermo - paths enable/disable registration[skip ci]	2017-01-10 15:22:36 -03:00
recover-mail-template.php	Guillermo - path edit/recover-mail-templates [skip ci]	2017-01-03 20:35:46 -03:00