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

author Vasudev Kamath <kamathvasudev@gmail.com>

Fri, 27 Apr 2012 17:13:26 +0000 (22:43 +0530)

committer Vasudev Kamath <kamathvasudev@gmail.com>

Fri, 27 Apr 2012 17:13:26 +0000 (22:43 +0530)
author Vasudev Kamath <kamathvasudev@gmail.com>
Fri, 27 Apr 2012 17:13:26 +0000 (22:43 +0530)
committer Vasudev Kamath <kamathvasudev@gmail.com>
Fri, 27 Apr 2012 17:13:26 +0000 (22:43 +0530)
diff --cc view/theme/diabook/group_side.tpl

index 1c8ebcd9fb30b53d46163835961524b464dff052,ce4b25fbf75088795ba605d075324c35c1546a5a..ce4b25fbf75088795ba605d075324c35c1546a5a

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

index e8518a1c6f4423c38b08f2b68ceac21212ccb15a,c45db9884d756ef20393881c6a103c8af1b35b7a..c45db9884d756ef20393881c6a103c8af1b35b7a

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>
	Fri, 27 Apr 2012 17:13:26 +0000 (22:43 +0530)
committer	Vasudev Kamath <kamathvasudev@gmail.com>
	Fri, 27 Apr 2012 17:13:26 +0000 (22:43 +0530)
		1	2
view/theme/diabook/group_side.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/diabook/theme.php	patch \|	diff1 \|	diff2 \|	blob \| history