]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc66a86 bd01a1c)
Merge remote-tracking branch 'upstream/develop' into 1606-database
authorMichael Vogel <icarus@dabo.de>
Tue, 7 Jun 2016 04:12:28 +0000 (06:12 +0200)
committerMichael Vogel <icarus@dabo.de>
Tue, 7 Jun 2016 04:12:28 +0000 (06:12 +0200)

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