diaspora/app
Raphael ec9e180eab Merge branch 'master' into HEAD
Conflicts:
	public/stylesheets/application.css
2010-10-07 13:58:06 -07:00
..
controllers Don't redirect on status message create 2010-10-07 12:01:49 -07:00
helpers added a warning, moved connected as into a partial, removed the 2010-09-27 16:31:19 -07:00
models Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
uploaders Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
views Merge branch 'master' into HEAD 2010-10-07 13:58:06 -07:00