]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49527b7 e491750)
Merge branch 'develop' into rewrites/coding-convention-split2
authorHypolite Petovan <mrpetovan@gmail.com>
Mon, 3 Apr 2017 10:35:27 +0000 (06:35 -0400)
committerGitHub <noreply@github.com>
Mon, 3 Apr 2017 10:35:27 +0000 (06:35 -0400)
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.