]> git.mxchange.org Git - friendica-addons.git/commitdiff
projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6186153 87d3141)
Merge branch 'master' of github.com:CatoTH/friendica-addons
authorTobias Hößl <tobias@hoessl.eu>
Sat, 11 Aug 2012 08:08:23 +0000 (08:08 +0000)
committerTobias Hößl <tobias@hoessl.eu>
Sat, 11 Aug 2012 08:08:23 +0000 (08:08 +0000)
Conflicts:
dav/common/calendar_rendering.fnk.php


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.