]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0bfe57b c86edd6)
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items
authorMichael Vogel <icarus@dabo.de>
Sat, 20 Dec 2014 08:37:33 +0000 (09:37 +0100)
committerMichael Vogel <icarus@dabo.de>
Sat, 20 Dec 2014 08:37:33 +0000 (09:37 +0100)

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