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
..
devise	Revert "updated locales"	2011-02-22 16:07:31 +01:00
diaspora	added post author to the subject of the also commented email as well as the notification	2011-02-23 13:03:11 -08:00
inflections	Added grammatical inflection support using I18n Inflector with Rails plug-in	2011-01-14 18:33:15 +01:00
javascript	Revert "updated locales"	2011-02-22 16:07:31 +01:00
rails-i18n	updated locales	2011-02-19 12:00:07 +01:00