nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/layouts
History
danielvincent 0c16038e2d Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/views/layouts/application.html.haml
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
2010-06-29 17:30:29 -07:00
..
application.html.haml Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-29 17:30:29 -07:00
session_wall.html.haml Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-28 22:18:47 -07:00