Merge branch 'master' of git://github.com/friendica/friendica

author Vasudev Kamath <kamathvasudev@gmail.com>

Sat, 12 May 2012 14:50:26 +0000 (20:20 +0530)

committer Vasudev Kamath <kamathvasudev@gmail.com>

Sat, 12 May 2012 14:50:26 +0000 (20:20 +0530)
author Vasudev Kamath <kamathvasudev@gmail.com>
Sat, 12 May 2012 14:50:26 +0000 (20:20 +0530)
committer Vasudev Kamath <kamathvasudev@gmail.com>
Sat, 12 May 2012 14:50:26 +0000 (20:20 +0530)
diff --cc view/theme/diabook/communityhome.tpl

index 6fa330140aba802e15b277dfcc4de02866dc7bff,caefed3b38034a33eb0b44db3c3acd196bd25bc1..caefed3b38034a33eb0b44db3c3acd196bd25bc1

mode 100644,100755..100644
--- 1/view/theme/diabook/communityhome.tpl
--- 2/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
diff --cc view/theme/diabook/theme.php

index 8a7bf19e96055064ee78bc175df73fa834f351a6,f701d7d8329a0d2e4fc7703164e8fb14bd21d1c1..f701d7d8329a0d2e4fc7703164e8fb14bd21d1c1

mode 100644,100755..100644
--- 1/view/theme/diabook/theme.php
--- 2/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
author	Vasudev Kamath <kamathvasudev@gmail.com>
	Sat, 12 May 2012 14:50:26 +0000 (20:20 +0530)
committer	Vasudev Kamath <kamathvasudev@gmail.com>
	Sat, 12 May 2012 14:50:26 +0000 (20:20 +0530)
		1	2
view/theme/diabook/communityhome.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/diabook/theme.php	patch \|	diff1 \|	diff2 \|	blob \| history