diaspora/public/stylesheets
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
..
blueprint optimized images (safes a few bits and makes pagespeed shut the fuck up ) 2011-05-31 17:34:22 +02:00
sass Merge branch 'master' into oauth 2011-06-28 17:13:38 -07:00
vendor optimized images (safes a few bits and makes pagespeed shut the fuck up ) 2011-05-31 17:34:22 +02:00
.gitkeep Activerecord this time\! 2010-06-11 10:40:49 -07:00