danielgrippi 0112285985 Merge branch 'master' into profiles ... Conflicts: lib/diaspora/shareable.rb		2012-02-27 14:27:05 -08:00
..
controllers	Merge branch 'master' into profiles	2012-02-27 14:27:05 -08:00
helpers	MS DC show last post and show page works unauthenticated	2012-02-24 19:09:00 -08:00
mailers	generate recipient header with Mail::Address to properly handle non-ASCII characters	2012-01-21 19:16:09 +01:00
models	Merge branch 'master' into profiles	2012-02-27 14:27:05 -08:00
presenters	MS DC show last post and show page works unauthenticated	2012-02-24 19:09:00 -08:00
uploaders	added support for uploading images with .tiff extensions	2012-01-02 21:40:46 -05:00
views	Merge branch 'master' into profiles	2012-02-27 14:27:05 -08:00