]> git.mxchange.org Git - friendica-addons.git/commit
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)
commit7f4cb9cf06a933f85a04389548a9a592bdb186ab
tree4ebbd9f6faaf19acc2b5ecf76c9719417b67ea3b
parent6186153f689e4863a75bf574f97cc75ada7954c9
parent87d314170bf0e89c8f16ec0d723744b3b09c454a
Merge branch 'master' of github.com:CatoTH/friendica-addons

Conflicts:
dav/common/calendar_rendering.fnk.php