Raphael Sofaer 1af945de11 Merge branch 'master' into oauth ... Conflicts: Gemfile Gemfile.lock app/models/app_config.rb app/models/post.rb db/schema.rb public/stylesheets/sass/application.sass spec/lib/webfinger_spec.rb		2011-06-28 17:13:38 -07:00
..
cldr	added arabic	2011-05-08 01:02:33 +02:00
devise	updated locales	2011-06-23 14:06:54 +02:00
diaspora	Merge branch 'master' into oauth	2011-06-28 17:13:38 -07:00
inflections	added readme for inflection definitions	2011-04-18 22:37:24 +02:00
javascript	updated locales	2011-06-23 14:06:54 +02:00
rails-i18n	updated locales	2011-06-18 23:18:04 +02:00