diaspora/config/locales
Raphael Sofaer d5ecce7ca6 Merge branch 'limit_similar_contacts'
Conflicts:
	app/controllers/people_controller.rb
2011-04-12 11:48:41 -07:00
..
devise updated locales 2011-04-12 16:24:59 +02:00
diaspora Merge branch 'limit_similar_contacts' 2011-04-12 11:48:41 -07:00
inflections Inflection aliases updated 2011-02-25 22:09:54 +01:00
javascript updated locales 2011-04-12 16:24:59 +02:00
rails-i18n updated locales 2011-04-12 16:24:59 +02:00