ivan 948b476c12 Merge branch 'master' into Add-email-sender-class ... # Conflicts: # server/composer.json # server/controllers/user/signup.php		2016-07-14 01:45:50 -03:00
..
Controller.php	Ivan - Implement respect/validation for validation [skip ci]	2016-07-04 15:57:00 -03:00
ControllerGroup.php	[Ivan Diaz] - Move folder architecture	2016-04-17 18:44:24 -03:00
EmailSender.php	Ivan - Fix email sender issues [skip ci]	2016-07-08 18:00:52 -03:00
FileUploader.php	[Ivan Diaz] - OS-#39 - Add User/Ticket/Comment classes	2016-05-14 19:08:30 -03:00
Hashing.php	[Ivan Diaz] - OS-#39 - Add User/Ticket/Comment classes	2016-05-14 19:08:30 -03:00
Validator.php	Ivan - Implement respect/validation for validation [skip ci]	2016-07-04 15:57:00 -03:00