Maxwell Salzberg c66b7d584d Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown ... Conflicts: Gemfile.lock		2011-08-27 14:13:15 -07:00
..
controllers	Avoid RecordNotFound exception thrown by find method when invalid person_id	2011-08-27 02:45:58 -03:00
helpers	Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown	2011-08-27 14:13:15 -07:00
mailers	reshares now have notifications, slight refactor of the notification helper	2011-08-25 17:16:09 -07:00
models	a user now has the option to disable reshare email notifications	2011-08-25 17:16:09 -07:00
uploaders	Revert "Revert "Revert "remove uploaded test images after running the specs/cucumber"" -- using == now instead of ="	2011-08-18 12:06:04 -07:00
views	Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown	2011-08-27 14:13:15 -07:00