]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85a9c7d 2bd3deb)
Merge remote-tracking branch 'upstream/develop' into 1606-dbm
authorMichael Vogel <icarus@dabo.de>
Thu, 2 Jun 2016 05:37:37 +0000 (07:37 +0200)
committerMichael Vogel <icarus@dabo.de>
Thu, 2 Jun 2016 05:37:37 +0000 (07:37 +0200)

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