]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1187119 1cfff8f)
Merge branch 'pull'
authorfriendica <info@friendica.com>
Tue, 21 Feb 2012 02:07:16 +0000 (18:07 -0800)
committerfriendica <info@friendica.com>
Tue, 21 Feb 2012 02:07:16 +0000 (18:07 -0800)
1  2 
include/text.php patch | diff1 | diff2 | blob | history

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