]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28b0855 d3290f3)
Merge remote-tracking branch 'upstream/master'
authorMichael <ike@pirati.ca>
Sat, 3 Nov 2012 21:27:34 +0000 (22:27 +0100)
committerMichael <ike@pirati.ca>
Sat, 3 Nov 2012 21:27:34 +0000 (22:27 +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.