Maxwell Salzberg f479a9a144 Merge branch 'brianwisti-1305-full-markdown'		2011-08-29 10:56:48 -07:00
..
controllers	Use explicit parameters instead of request format to determine whether we render a remote or non-remote form in aspects#new.	2011-08-28 16:08:57 -07: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 'brianwisti-1305-full-markdown'	2011-08-29 10:56:48 -07:00