Merge branch 'master' of git://github.com/friendica/friendica
authorVasudev Kamath <kamathvasudev@gmail.com>
Sun, 22 Apr 2012 06:38:05 +0000 (12:08 +0530)
committerVasudev Kamath <kamathvasudev@gmail.com>
Sun, 22 Apr 2012 06:38:05 +0000 (12:08 +0530)
commitf1d84c10458986a0a014f844e784617401764b29
treea9428755260c3e132ccc507e1df4656431964c43
parent4499ce96a0c5fd7ca9feb2b9b5e62876155aa63e
parent54817f058a4f62301525950d8cdf0189b4d964dc
Merge branch 'master' of git://github.com/friendica/friendica
view/theme/diabook/communityhome.tpl
view/theme/diabook/diabook-dark/ch_directory_item.tpl
view/theme/diabook/diabook-dark/directory_item.tpl
view/theme/diabook/diabook-dark/group_side.tpl
view/theme/diabook/diabook-dark/icons/block.png
view/theme/diabook/theme.php