]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 377fe31 06ea236)
Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba
authorMichael <heluecht@pirati.ca>
Fri, 12 May 2017 16:12:00 +0000 (16:12 +0000)
committerMichael <heluecht@pirati.ca>
Fri, 12 May 2017 16:12:00 +0000 (16:12 +0000)

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