diaspora/db
zhitomirskiyi 21e3c2ae73 Merge branch 'open-aspects'
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/home_controller.rb
	app/helpers/application_helper.rb
	db/migrate/20110201013408_add_open_aspects_to_user.rb
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/home_controller_spec.rb
2011-02-01 17:32:08 -08:00
..
migrate storing it as a boolean in the aspect 2011-02-01 17:25:15 -08:00
seeds Handling bug http://bugs.joindiaspora.com/issues/767 2010-12-31 14:53:32 +01:00
schema.rb Merge branch 'open-aspects' 2011-02-01 17:32:08 -08:00
seeds.rb Fix rake db:reset 2010-12-15 11:28:50 -08:00