nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app
History
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
..
controllers Merge branch 'open-aspects' 2011-02-01 17:32:08 -08:00
helpers Merge branch 'open-aspects' 2011-02-01 17:32:08 -08:00
mailers Fix build 2011-01-28 12:18:56 -08:00
models Revert "Merge branch 'open-aspects'" 2011-02-01 13:15:20 -08:00
uploaders remove s3 setting 2011-01-17 16:46:39 -08:00
views Revert "Merge branch 'open-aspects'" 2011-02-01 13:15:20 -08:00