James Allen 128c672edd Merge branch 'github-sync' ...

Conflicts:
	package.json

2014-10-08 12:13:37 +01:00

..

login.jade

…

passwordReset.jade

…

register.jade

…

restricted.jade

…

setPassword.jade

…

settings.jade

Add in Dropbox description

2014-10-07 14:42:03 +01:00