MrZYX 98cdee97c0 Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections ... Conflicts: Gemfile app/controllers/application_controller.rb app/controllers/posts_controller.rb app/controllers/publics_controller.rb		2011-02-24 00:33:34 +01:00
..
controllers	Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections	2011-02-24 00:33:34 +01:00
helpers	added post author to the subject of the also commented email as well as the notification	2011-02-23 13:03:11 -08:00
mailers	localize emails	2011-02-12 17:35:12 +01:00
models	changed the delete to a destroy on retraction, also removed a puts	2011-02-23 12:00:42 -08:00
uploaders	remove s3 setting	2011-01-17 16:46:39 -08:00
views	parinoid checks for admin page thx dangold	2011-02-22 15:43:10 -08:00