]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86adadd 71f9e50)
Merge remote-tracking branch 'upstream/develop' into 1610-performance
authorMichael <heluecht@pirati.ca>
Thu, 27 Oct 2016 12:18:45 +0000 (12:18 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 27 Oct 2016 12:18:45 +0000 (12:18 +0000)
1  2 
boot.php patch | diff1 | diff2 | blob | history
mod/admin.php patch | diff1 | diff2 | blob | history

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