nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/db
History
Raphael Sofaer 1af945de11 Merge branch 'master' into oauth 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
2011-06-28 17:13:38 -07:00
..
migrate Merge branch 'master' into oauth 2011-06-28 17:13:38 -07:00
seeds rename config/app_config.yml to config/app.yml in accordance to The Redundant Rendundacy Act of 2011 2011-05-18 11:46:45 -07:00
schema.rb Merge branch 'master' into oauth 2011-06-28 17:13:38 -07:00
seeds.rb Fix db seed, refactor aspect-filters a bunch, fix stream_element a little 2011-04-13 18:13:26 -07:00