]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59766b9 5a41676)
Merge branch 'master' of git://github.com/friendica/friendica
authorTobias Hößl <tobias@hoessl.eu>
Tue, 13 Mar 2012 18:34:15 +0000 (18:34 +0000)
committerTobias Hößl <tobias@hoessl.eu>
Tue, 13 Mar 2012 18:34:15 +0000 (18:34 +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.