diaspora/app/views/layouts
Raphael d71966476b Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top
Conflicts:
	app/views/albums/show.html.haml
	app/views/authors/show.html.haml
	app/views/layouts/application.html.haml
	app/views/photos/show.html.haml
2010-08-09 15:09:05 -07:00
..
application.html.haml Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top 2010-08-09 15:09:05 -07:00
session_wall.html.haml added email field to login screen. strange error won't let me log in? 2010-08-06 23:55:05 -07:00