diaspora/app/views/aspects
ilya 08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
2010-09-27 15:39:50 -07:00
..
_new_aspect.haml Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
index.html.haml Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
manage.html.haml Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
public.html.haml passing the right things to the partial 2010-09-24 15:52:29 -07:00
show.html.haml Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00