nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app
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
..
controllers Merge branch 'master' into oauth 2011-06-28 17:13:38 -07:00
helpers reset the notifications helper to master's version and monkey patch header 2011-06-27 19:51:35 -07:00
mailers Revert "added a podwide email preference" 2011-05-18 10:38:45 -07:00
models Merge branch 'master' into oauth 2011-06-28 17:13:38 -07:00
uploaders Make urls not change on processing 2011-03-21 18:42:36 -07:00
views Merge branch 'master' into oauth 2011-06-28 17:13:38 -07:00