diff options
| author | diosmosis <benaka@piwik.pro> | 2014-11-16 03:06:05 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2014-11-16 03:06:05 +0300 |
| commit | e130d9d6ad6d2ba6edc0e2af1a9aa8f548d94b9b (patch) | |
| tree | a7259f218c949897883952757a2ed97ddec3ee8c /plugins/Contents | |
| parent | ebce0b377b825a61b1e0bc7a136fd20ad24bdbe3 (diff) | |
| parent | 4e5610aba57e03d375e8671ec4d90788e8efc70c (diff) | |
Merge branch 'master' into processed_metrics_metadata
Conflicts:
core/Twig.php
Diffstat (limited to 'plugins/Contents')
| -rw-r--r-- | plugins/Contents/lang/fr.json | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/Contents/lang/fr.json b/plugins/Contents/lang/fr.json new file mode 100644 index 0000000000..3d03a8af80 --- /dev/null +++ b/plugins/Contents/lang/fr.json @@ -0,0 +1,5 @@ +{ + "Contents": { + "Contents": "Contenus" + } +}
\ No newline at end of file |