From: Vasudev Kamath <kamathvasudev@gmail.com>
Date: Sat, 5 May 2012 15:18:16 +0000 (+0530)
Subject: Merge branch 'master' of git://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80;p=friendica.git

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

b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80
diff --cc view/theme/diabook/communityhome.tpl
index 66f93c32d8,0386d63d36..0386d63d36
mode 100644,100755..100644
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
diff --cc view/theme/diabook/theme.php
index c45db9884d,f8fdeb8b1a..f8fdeb8b1a
mode 100644,100755..100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php