Will Marshall fc02e7857a Merge branch 'master' into laura_and_will ...

Conflicts:
	app/views/shopping_shared/_contact.html.haml

2014-06-04 17:24:30 +10:00

..

authentication.html.haml

Adding X from new icon font to modal

2014-06-03 11:48:11 +10:00

flash.html.haml

Compacting down our flash messages

2014-06-04 17:13:19 +10:00

forgot.html.haml

Adding reset password stuff

2014-05-09 14:26:07 +10:00

login.html.haml

Authentication steps test

2014-05-09 14:13:39 +10:00

signup.html.haml

Authentication steps test

2014-05-09 14:13:39 +10:00

test.nghaml

Removing pointless foundation crud, reworking the login

2014-05-06 18:28:20 +10:00