]> git.mxchange.org Git - friendica-addons.git/commitdiff
projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51432d9 6cd9da4)
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Wed, 16 May 2012 06:25:08 +0000 (08:25 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 16 May 2012 06:25:08 +0000 (08:25 +0200)

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