]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4757bf5 546e280)
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items
authorMichael Vogel <icarus@dabo.de>
Sun, 21 Dec 2014 09:59:56 +0000 (10:59 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 21 Dec 2014 09:59:56 +0000 (10:59 +0100)

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