]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a08232f 2eafa9a)
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Tue, 29 May 2012 14:09:26 +0000 (16:09 +0200)
committerMichael Vogel <icarus@dabo.de>
Tue, 29 May 2012 14:09:26 +0000 (16:09 +0200)

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