]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master' of git://github.com/friendica/friendica
authorVasudev Kamath <kamathvasudev@gmail.com>
Fri, 6 Jul 2012 17:17:27 +0000 (22:47 +0530)
committerVasudev Kamath <kamathvasudev@gmail.com>
Fri, 6 Jul 2012 17:17:27 +0000 (22:47 +0530)
commitba4db236ecff1ffdb56adc2715b3f53515f8cb34
treef0b9928aade8aab95d1608890fde1918ce163754
parent6e4760dd9c512147309b5e4a98d25216610f81da
parenta122fecf50d06856a2ada8b564f711fb52c327f0
Merge branch 'master' of git://github.com/friendica/friendica
view/theme/diabook/directory_item.tpl
view/theme/diabook/jot.tpl
view/theme/diabook/theme.php