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

author Vasudev Kamath <kamathvasudev@gmail.com>

Sat, 5 May 2012 15:18:16 +0000 (20:48 +0530)

committer Vasudev Kamath <kamathvasudev@gmail.com>

Sat, 5 May 2012 15:18:16 +0000 (20:48 +0530)
author Vasudev Kamath <kamathvasudev@gmail.com>
Sat, 5 May 2012 15:18:16 +0000 (20:48 +0530)
committer Vasudev Kamath <kamathvasudev@gmail.com>
Sat, 5 May 2012 15:18:16 +0000 (20:48 +0530)
diff --cc view/theme/diabook/communityhome.tpl

index 66f93c32d825a0ef08ea82909e0541c2379a21f9,0386d63d36d847d9919cd1ef9c87ff2938f14c18..0386d63d36d847d9919cd1ef9c87ff2938f14c18

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 c45db9884d756ef20393881c6a103c8af1b35b7a,f8fdeb8b1a19bcb3026055f9f314475b18120d63..f8fdeb8b1a19bcb3026055f9f314475b18120d63

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, 5 May 2012 15:18:16 +0000 (20:48 +0530)
committer	Vasudev Kamath <kamathvasudev@gmail.com>
	Sat, 5 May 2012 15:18:16 +0000 (20:48 +0530)
		1	2
view/theme/diabook/communityhome.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/diabook/theme.php	patch \|	diff1 \|	diff2 \|	blob \| history