projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
629ddb0
48ebbf1
)
Merge remote-tracking branch 'hernic/patch-4' into next
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Fri, 27 Sep 2013 04:29:50 +0000
(06:29 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Fri, 27 Sep 2013 04:29:50 +0000
(06:29 +0200)
1
2
src/main/resources/i18n/sone.fr.properties
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/main/resources/i18n/sone.fr.properties
Simple merge
projects / Sone.git / commitdiff