]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e967ed 8b7b0bd)
Merge branch 'omigeot-master'
authorFriendika <info@friendika.com>
Mon, 18 Apr 2011 22:20:45 +0000 (15:20 -0700)
committerFriendika <info@friendika.com>
Mon, 18 Apr 2011 22:20:45 +0000 (15:20 -0700)
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.