Merge pull request #22 from tsawler/Development

tsawler · tsawler · commit 5784d48d108f · 2015-06-11T11:22:54.000-03:00
Development
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
   ],
   "require": {
     "php": ">=5.5.0",
-    "illuminate/support": "5.0.*",
+    "illuminate/support": ">=5.0.0",
     "intervention/image": "2.*"
   },
   "autoload": {
diff --git a/src/lang/fr/lfm.php b/src/lang/fr/lfm.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'upload'       => 'Télécharger',
+    'upload'       => 'Charger',
     'thumbnails'   => 'Vignettes',
     'list'         => 'Liste',
     'new_folder'   => 'Nouveau dossier',
