]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7bfff1 b9dda93)
Merge https://github.com/friendica/friendica into pull
authorfriendica <info@friendica.com>
Thu, 8 Mar 2012 22:35:47 +0000 (14:35 -0800)
committerfriendica <info@friendica.com>
Thu, 8 Mar 2012 22:35:47 +0000 (14:35 -0800)
1  2 
view/theme/diabook/nav.tpl patch | diff1 | diff2 | blob | history

diff --cc view/theme/diabook/nav.tpl
Simple merge
Unnamed repository; edit this file 'description' to name the repository.