]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07ebc15 c248b28)
Merge remote branch 'mike/master'
authorolivierm <olivier@migeot.org>
Tue, 8 Mar 2011 13:39:26 +0000 (14:39 +0100)
committerolivierm <olivier@migeot.org>
Tue, 8 Mar 2011 13:39:26 +0000 (14:39 +0100)
1  2 
view/fr/strings.php patch | diff1 | diff2 | blob | history

diff --cc view/fr/strings.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.