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
..
application.sass	Merge branch 'master' of github.com:diaspora/diaspora into fb	2010-09-27 15:39:50 -07:00
sessions.sass	Big clean up: delete trailing whitespace	2010-09-26 12:48:40 -04:00
ui.sass	Spell our own name right	2010-09-15 17:56:18 -07:00