]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8bdb026 4b6afbf)
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Wed, 30 Sep 2015 08:03:52 +0000 (10:03 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 30 Sep 2015 08:03:52 +0000 (10:03 +0200)

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