]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b1b052 995a81b)
Merge remote-tracking branch 'upstream/develop' into post-delivery-data
authorMichael <heluecht@pirati.ca>
Tue, 5 May 2020 13:16:01 +0000 (13:16 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 5 May 2020 13:16:01 +0000 (13:16 +0000)
1  2 
static/dbstructure.config.php patch | diff1 | diff2 | blob | history

diff --cc static/dbstructure.config.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.