Connor Turland 1b5ac1dafa merged develop into thevalueweb		2014-12-03 08:26:11 -05:00
..
confirmations	added completely new logging in system	2013-07-10 14:02:38 -04:00
mailer	changes for reset password form	2014-10-27 18:24:30 -04:00
passwords	changes for reset password form	2014-10-27 18:24:30 -04:00
registrations	updated the 404 page. fixed merge conflicts. removed generation code	2014-11-23 22:58:30 -05:00
sessions	style changes for account pages	2014-09-26 22:31:06 -04:00
shared	added completely new logging in system	2013-07-10 14:02:38 -04:00
unlocks	added completely new logging in system	2013-07-10 14:02:38 -04:00
edit.html.erb	changed user image settings. added mapper profile page	2014-11-25 15:06:30 -05:00