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
..
login.php	Ivan - Fix master phpunit build: Undesired property	2016-07-08 04:27:17 -03:00
logout.php	Ivan - Implement respect/validation for validation [skip ci]	2016-07-04 15:57:00 -03:00
signup.php	Merge branch 'master' into Add-email-sender-class	2016-07-14 01:45:50 -03:00