From: Vasudev Kamath Date: Sun, 22 Apr 2012 06:38:05 +0000 (+0530) Subject: Merge branch 'master' of git://github.com/friendica/friendica X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f1d84c10458986a0a014f844e784617401764b29;p=friendica.git Merge branch 'master' of git://github.com/friendica/friendica --- f1d84c10458986a0a014f844e784617401764b29 diff --cc view/theme/diabook/communityhome.tpl index ff04d9da0d,66f93c32d8..66f93c32d8 mode 100644,100755..100644 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl diff --cc view/theme/diabook/diabook-dark/ch_directory_item.tpl index 0000000000,db1936e4b7..db1936e4b7 mode 000000,100755..100644 --- a/view/theme/diabook/diabook-dark/ch_directory_item.tpl +++ b/view/theme/diabook/diabook-dark/ch_directory_item.tpl diff --cc view/theme/diabook/diabook-dark/directory_item.tpl index 0000000000,bc2af16c21..bc2af16c21 mode 000000,100755..100644 --- a/view/theme/diabook/diabook-dark/directory_item.tpl +++ b/view/theme/diabook/diabook-dark/directory_item.tpl diff --cc view/theme/diabook/diabook-dark/group_side.tpl index 0000000000,8600402f29..8600402f29 mode 000000,100755..100644 --- a/view/theme/diabook/diabook-dark/group_side.tpl +++ b/view/theme/diabook/diabook-dark/group_side.tpl diff --cc view/theme/diabook/diabook-dark/icons/block.png index 0000000000,a0b1dffe91..a0b1dffe91 mode 000000,100755..100644 Binary files differ diff --cc view/theme/diabook/theme.php index 29e71c6115,e8518a1c6f..e8518a1c6f mode 100644,100755..100644 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php