]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cbf53be 8b101c6)
Merge branch 'master' of git://github.com/friendica/friendica
authorVasudev Kamath <kamathvasudev@gmail.com>
Sun, 12 Feb 2012 09:36:41 +0000 (15:06 +0530)
committerVasudev Kamath <kamathvasudev@gmail.com>
Sun, 12 Feb 2012 09:36:41 +0000 (15:06 +0530)
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.