]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8449e6 0ed7a23)
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn
authorMichael Vogel <icarus@dabo.de>
Thu, 21 Jan 2016 22:05:02 +0000 (23:05 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 21 Jan 2016 22:05:02 +0000 (23:05 +0100)
1  2 
include/items.php patch | diff1 | diff2 | blob | history

diff --cc include/items.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.