Jonne Haß f5a4bc51c2 Merge branch 'patch-2' of git://github.com/rivendale2010/diaspora into develop ... Conflicts: Changelog.md app/views/layouts/_header.html.haml		2013-05-18 20:03:59 +02:00
..
_footer.html.haml
_header.html.haml	Merge branch 'patch-2' of git://github.com/rivendale2010/diaspora into develop	2013-05-18 20:03:59 +02:00
application.html.haml
application.mobile.haml
centered_with_header_with_footer.html.haml
notifier.html.erb
notifier.text.haml
with_header.html.haml
with_header_with_footer.html.haml