]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f8284e 880dda4)
Merge remote-tracking branch 'upstream/develop' into 1509-new-feed-import
authorMichael Vogel <icarus@dabo.de>
Tue, 29 Sep 2015 08:27:04 +0000 (10:27 +0200)
committerMichael Vogel <icarus@dabo.de>
Tue, 29 Sep 2015 08:27:04 +0000 (10:27 +0200)
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.