]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 959aa13 70709a8)
Merge pull request #132 from campino/master
authorfriendica <info@friendica.com>
Wed, 14 Mar 2012 22:16:30 +0000 (15:16 -0700)
committerfriendica <info@friendica.com>
Wed, 14 Mar 2012 22:16:30 +0000 (15:16 -0700)
Test cases

1  2 
mod/item.php patch | diff1 | diff2 | blob | history

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