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
..
controllers	Merge branch 'master' into Add-email-sender-class	2016-07-14 01:45:50 -03:00
libs	Merge branch 'master' into Add-email-sender-class	2016-07-14 01:45:50 -03:00
models	Merged in create-ticket/comment (pull request #18)	2016-07-08 04:02:55 -03:00
tests	[Ivan Diaz] - OS-#39 - Fix test issues	2016-05-14 20:22:46 -03:00
composer.json	Merge branch 'master' into Add-email-sender-class	2016-07-14 01:45:50 -03:00
config.php	[Ivan Diaz] -Add default values if environment variables are not defined	2016-05-14 15:32:44 -03:00
index.php	Merge branch 'master' into Add-email-sender-class	2016-07-14 01:45:50 -03:00
run-tests.sh	[Ivan Diaz] - Move folder architecture	2016-04-17 18:44:24 -03:00