nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/db
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
..
migrate Merge branch 'private_messages' 2011-03-08 21:23:41 -08:00
seeds Handling bug http://bugs.joindiaspora.com/issues/767 2010-12-31 14:53:32 +01:00
schema.rb Merge branch 'private_messages' 2011-03-08 21:23:41 -08:00
seeds.rb remove extra sass rule, add db:seed 2011-02-09 16:07:25 -08:00