app/views/layouts/application.html.haml · 1312728b8853ce08956fdebc78e92fdf3d7bb089 · facil / parlote-facil · GitLab

sept. 13, 2010
1312728b
Merge branch 'master' of github.com:diaspora/diaspora · 1312728b
Raphael a rédigé sept. 13, 2010
```
Conflicts:
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
```
1312728b
Merge branch 'master' of github.com:diaspora/diaspora
Raphael a rédigé sept. 13, 2010
```
Conflicts:
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
```