Connor Turland 13937ae51d merged conflicts coming from develop branch		2014-10-22 11:52:31 -04:00
..
assets	merged conflicts coming from develop branch	2014-10-22 11:52:31 -04:00
controllers	merged conflicts coming from develop branch	2014-10-22 11:52:31 -04:00
helpers	fixed issue that others might end up having with sso_key	2014-10-07 19:14:25 -04:00
mailers	added all files	2012-09-22 22:39:12 -04:00
models	got profile picture uploading working, as well as profile picture removing, as well as password changing	2014-10-21 20:31:59 -04:00
views	merged conflicts coming from develop branch	2014-10-22 11:52:31 -04:00
workers	setup for automatic config for urls	2014-10-10 21:24:31 -04:00