]> git.mxchange.org Git - friendica-addons.git/commitdiff
projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11f1d7e 1a99b8a)
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 7 Apr 2012 16:33:41 +0000 (18:33 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 7 Apr 2012 16:33:41 +0000 (18:33 +0200)

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