]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ffeb4c 6a2a54c)
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Fri, 25 Oct 2013 21:35:03 +0000 (23:35 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 25 Oct 2013 21:35:03 +0000 (23:35 +0200)
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.