]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a147d61 bdbe068)
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 21 Apr 2012 17:26:24 +0000 (19:26 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 21 Apr 2012 17:26:24 +0000 (19:26 +0200)

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