diff options
| author | Frederic Guillot <fred@kanboard.net> | 2016-03-06 15:40:10 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2016-03-06 15:40:10 -0500 |
| commit | c8de706e62f3186b89e4c81697bb148ea23b91b1 (patch) | |
| tree | c62d57c68f7c7c4120ac79ac09aa41a51575f9a1 /app/Locale/fr_FR/translations.php | |
| parent | 4c9179878182e49e42d47a004c24b0aa9c9b72ee (diff) | |
| parent | 6bdf3cccf79b6e305ccd89e7d86e9980905ddac6 (diff) | |
Merge #1952 and solve conflict
Diffstat (limited to 'app/Locale/fr_FR/translations.php')
0 files changed, 0 insertions, 0 deletions