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	[Sprites] update sprites after develop merge	2013-03-11 20:16:16 -03:00
_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	dry up and modularize layouts	2013-03-06 19:00:34 +01:00
application.mobile.haml	Fix show more post in my activity mobile page. Close #4108	2013-04-08 00:04:42 +02:00
centered_with_header_with_footer.html.haml	dry up and modularize layouts	2013-03-06 19:00:34 +01:00
notifier.html.erb	query the set url only through #pod_uri in the app	2012-09-26 20:19:37 +02:00
notifier.text.haml	use pod name helper in emails	2012-06-04 14:04:39 -07:00
with_header.html.haml	dry up and modularize layouts	2013-03-06 19:00:34 +01:00
with_header_with_footer.html.haml	dry up and modularize layouts	2013-03-06 19:00:34 +01:00