diff options
author | Frederic Guillot <fred@kanboard.net> | 2016-08-23 20:08:16 -0400 |
---|---|---|
committer | Frederic Guillot <fred@kanboard.net> | 2016-08-23 20:08:16 -0400 |
commit | 3b4326c397c1deb49311708d844e95234021cde4 (patch) | |
tree | 01a46b636fec04cb1366abbf1832cbe39298dcde /app/Locale/fr_FR/translations.php | |
parent | 73c79a6eb225a9eeb9f2b7499539dae612f99d64 (diff) | |
parent | ad9dc93cc3a0f0cc75ccaf9993108fb97d38a32a (diff) |
Fix conflicts for PR #2603 (Korean translations)
Diffstat (limited to 'app/Locale/fr_FR/translations.php')
0 files changed, 0 insertions, 0 deletions