https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1548449
dfd5cc5
)
Merge remote branch 'upstream/master'
author
Olivier Migeot
<olivier@migeot.org>
Tue, 4 Oct 2011 09:45:57 +0000
(11:45 +0200)
committer
Olivier 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