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
..
css	interface position fixed	2015-06-14 18:54:51 +03:00
images	First Commit	2015-05-09 22:00:14 +03:00
js	Merge remote-tracking branch 'origin/matanBranch'	2015-06-14 19:39:30 +03:00
views	log in to homepage - fixed	2015-06-14 19:35:50 +03:00
index.html	First Commit	2015-05-09 22:00:14 +03:00