]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1e5dfa 0b4e3a0)
Merge branch 'pull'
authorFriendika <info@friendika.com>
Wed, 5 Oct 2011 22:37:17 +0000 (15:37 -0700)
committerFriendika <info@friendika.com>
Wed, 5 Oct 2011 22:37:17 +0000 (15:37 -0700)
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.