]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d7c79d b51dedd)
Merge remote-tracking branch 'upstream/develop' into remote-rework
authorMichael <heluecht@pirati.ca>
Mon, 30 Sep 2019 06:32:55 +0000 (06:32 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 30 Sep 2019 06:32:55 +0000 (06:32 +0000)
1  2 
boot.php patch | diff1 | diff2 | blob | history

diff --cc boot.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.