]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb59f10 b8e8c96)
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
authorMichael <heluecht@pirati.ca>
Wed, 15 Mar 2017 13:55:43 +0000 (13:55 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 15 Mar 2017 13:55:43 +0000 (13:55 +0000)
1  2 
mod/admin.php patch | diff1 | diff2 | blob | history

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