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

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