summaryrefslogtreecommitdiffstats
path: root/i18n/fr.i18n.json
diff options
context:
space:
mode:
authorBéranger Campardou <b.campardou@gmail.com>2017-01-13 11:16:54 +0100
committerBéranger Campardou <b.campardou@gmail.com>2017-01-13 11:16:54 +0100
commit1169c0d7dc8184ed4db615673844024bbbfd4e66 (patch)
tree50ba38adfbbda66926dce48fa9d0be5c2ae5d9d5 /i18n/fr.i18n.json
parentf7f5f4a35d1fc9e3d559dcf413f3f221937f07f8 (diff)
downloadwekan-1169c0d7dc8184ed4db615673844024bbbfd4e66.tar.gz
wekan-1169c0d7dc8184ed4db615673844024bbbfd4e66.tar.bz2
wekan-1169c0d7dc8184ed4db615673844024bbbfd4e66.zip
resolve conflicts
Diffstat (limited to 'i18n/fr.i18n.json')
0 files changed, 0 insertions, 0 deletions