maxwell 120c07ddf5 Merge branch 'master' of github.com:diaspora/diaspora		2011-01-19 16:04:54 -08:00
..
controllers	make jobs have a base class, which will verify the activerecord connection before trying the job	2011-01-19 14:10:42 -08:00
helpers	make jobs have a base class, which will verify the activerecord connection before trying the job	2011-01-19 14:10:42 -08:00
mailers	Merge almost complete, 4 failures	2011-01-14 16:00:10 -08:00
models	make jobs have a base class, which will verify the activerecord connection before trying the job	2011-01-19 14:10:42 -08:00
uploaders	remove s3 setting	2011-01-17 16:46:39 -08:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2011-01-19 16:04:54 -08:00