]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99f0c01 e6e8ebb)
Merge remote-tracking branch 'upstream/develop' into dba-2
authorMichael <heluecht@pirati.ca>
Fri, 11 Aug 2017 16:24:33 +0000 (16:24 +0000)
committerMichael <heluecht@pirati.ca>
Fri, 11 Aug 2017 16:24:33 +0000 (16:24 +0000)

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