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

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