nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/config/locales
History
danielgrippi 1f5edb1d92 Merge branch 'private_messages' 
Conflicts:
	app/controllers/status_messages_controller.rb
	app/models/data_point.rb
	app/models/status_message.rb
	db/schema.rb
	lib/fake.rb
	public/stylesheets/sass/application.sass
	spec/models/mention_spec.rb
2011-03-08 21:23:41 -08:00
..
devise updated locales 2011-03-08 15:38:18 +01:00
diaspora Merge branch 'private_messages' 2011-03-08 21:23:41 -08:00
inflections Inflection aliases updated 2011-02-25 22:09:54 +01:00
javascript updated locales 2011-03-08 15:38:18 +01:00
rails-i18n update i18n-inflector to 2.5.1; correct Polski to polski; fixed locales; thanks siefca 2011-02-25 21:41:32 +01:00