]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dea2e66 df6188f)
Merge branch 'release-3.3.3' into develop
authorfabrixxm <fabrix.xm@gmail.com>
Sat, 7 Feb 2015 11:57:12 +0000 (12:57 +0100)
committerfabrixxm <fabrix.xm@gmail.com>
Sat, 7 Feb 2015 11:57:12 +0000 (12:57 +0100)
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.