]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1532f0d 1a38515)
Merge remote-tracking branch 'upstream/develop' into failed
authorMichael <heluecht@pirati.ca>
Sun, 19 Jul 2020 01:18:35 +0000 (01:18 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 19 Jul 2020 01:18:35 +0000 (01:18 +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.