]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 310527e fc90323)
Merge branch 'master' into notify
authorfriendica <info@friendica.com>
Sat, 24 Dec 2011 06:40:04 +0000 (22:40 -0800)
committerfriendica <info@friendica.com>
Sat, 24 Dec 2011 06:40:04 +0000 (22:40 -0800)
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.