]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05223cc 316014e)
Merge remote branch 'upstream/master'
authorpixelroot <info@pixelbits.de>
Mon, 24 Sep 2012 08:16:05 +0000 (10:16 +0200)
committerpixelroot <info@pixelbits.de>
Mon, 24 Sep 2012 08:16:05 +0000 (10:16 +0200)

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