Merge branch 'hotfix/v2.4.1'

alexusmai · Jul 18, 2019 · 241cc69 · 241cc69
2 parents 494d67d + 3eab2c7
commit 241cc69
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@
 * Dynamic configuration (v2.4)
 * Supported locales : ru, en, ar, sr
 
-## In new version 2.4
+## In a new version 2.4
 
 Now you can create your own config repositories, it will allow to change your configuration dynamically.
 

diff --git a/src/FileManagerServiceProvider.php b/src/FileManagerServiceProvider.php
@@ -64,6 +64,11 @@ public function boot()
      */
     public function register()
     {
+        $this->mergeConfigFrom(
+            __DIR__.'/../config/file-manager.php',
+            'file-manager'
+        );
+
         // Config Repository
         $this->app->bind(
             ConfigRepository::class,