danielgrippi 7eaca0346c Merge branch 'master' into follow ... Conflicts: config/assets.yml public/stylesheets/sass/_mixins.scss spec/models/user/posting_spec.rb		2011-05-16 14:56:28 -07:00
..
cldr	added arabic	2011-05-08 01:02:33 +02:00
devise	updated locales	2011-05-16 21:02:15 +02:00
diaspora	Merge branch 'master' into follow	2011-05-16 14:56:28 -07:00
inflections	added readme for inflection definitions	2011-04-18 22:37:24 +02:00
javascript	Merge branch 'master' into follow	2011-05-16 14:56:28 -07:00
rails-i18n	updated locales	2011-05-14 00:04:43 +02:00