]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a86fd26 aaedac8)
Merge remote-tracking branch 'friendica/master'
authorFabio Comuni <fabrix.xm@gmail.com>
Mon, 21 Nov 2011 12:52:15 +0000 (13:52 +0100)
committerFabio Comuni <fabrix.xm@gmail.com>
Mon, 21 Nov 2011 12:52:15 +0000 (13:52 +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.