]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9da109 dfc5dc2)
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
authorMichael <heluecht@pirati.ca>
Mon, 13 Mar 2017 08:53:57 +0000 (08:53 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 13 Mar 2017 08:53:57 +0000 (08:53 +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.