Ivan Diaz 7b95c54257 Merge branch 'master' into os-147-151-file-architecture-and-backup ... Conflicts: server/controllers/system.php server/data/ERRORS.php tests/init.rb		2017-01-14 21:45:43 -03:00
..
mail-templates	Ivan - Add deploy on dev 3 changes and fixes [skip ci]	2017-01-10 17:07:49 -03:00
ERRORS.php	Merge branch 'master' into os-147-151-file-architecture-and-backup	2017-01-14 21:45:43 -03:00
EXCEPTIONS.php	Ivan - Add initial settings and initial mail templates [skip ci]	2016-07-26 18:30:51 -03:00
InitialMails.php	(Guillermo) actualization recover-password [skip ci]	2016-08-15 20:15:09 -03:00