]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f00683 275a1c6)
Merge pull request #3146 from annando/1701-pnut
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Thu, 2 Feb 2017 08:10:28 +0000 (09:10 +0100)
committerGitHub <noreply@github.com>
Thu, 2 Feb 2017 08:10:28 +0000 (09:10 +0100)
Preparation to add the social network "pnut"

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.