]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 638a6ac 4991fa4)
Merge remote-tracking branch 'upstream/develop' into write-tags
authorMichael <heluecht@pirati.ca>
Wed, 29 Apr 2020 02:38:33 +0000 (02:38 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 29 Apr 2020 02:38:33 +0000 (02:38 +0000)
1  2 
static/dbview.config.php patch | diff1 | diff2 | blob | history

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