Sagi Dayan 9ab8628f90 Merge remote-tracking branch 'origin/matanBranch' ... # Conflicts: # templates/js/controllers/registerController.js # templates/views/register.html		2015-06-14 19:39:30 +03:00
..
mainController.js	Fix To JS Error	2015-06-09 20:16:29 +03:00
registerController.js	Merge remote-tracking branch 'origin/matanBranch'	2015-06-14 19:39:30 +03:00