]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1548449 dfd5cc5)
Merge remote branch 'upstream/master'
authorOlivier Migeot <olivier@migeot.org>
Tue, 4 Oct 2011 09:45:57 +0000 (11:45 +0200)
committerOlivier Migeot <olivier@migeot.org>
Tue, 4 Oct 2011 09:45:57 +0000 (11:45 +0200)
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.