]> git.mxchange.org Git - friendica-addons.git/commitdiff
projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38caf9d 600dc9b)
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 19 May 2012 12:04:40 +0000 (14:04 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 19 May 2012 12:04:40 +0000 (14:04 +0200)

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