diaspora/app/views/layouts
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
..
_debug.haml Remove some old views, clean up routes, clean up. 2010-12-01 15:38:56 -08:00
_header.html.haml reset the notifications helper to master's version and monkey patch header 2011-06-27 19:51:35 -07:00
application.html.haml proof of concept for notifications overlay 2011-06-27 19:51:35 -07:00
application.mobile.haml move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz 2011-06-16 11:17:14 -07:00
notifier.html.haml cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
notifier.text.haml cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
popup.html.haml nicer auth prompt. wip. 2011-06-23 12:40:47 -07:00