]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8af8567 fb28713)
Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content
authorMichael Vogel <icarus@dabo.de>
Wed, 17 Feb 2016 11:18:46 +0000 (12:18 +0100)
committerMichael Vogel <icarus@dabo.de>
Wed, 17 Feb 2016 11:18:46 +0000 (12:18 +0100)
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.