]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ef69ad eff4ad2)
Merge branch '1612-spool' of github.com:annando/friendica into 1612-spool
authorMichael <heluecht@pirati.ca>
Thu, 1 Dec 2016 13:58:47 +0000 (13:58 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 1 Dec 2016 13:58:47 +0000 (13:58 +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.