Merge pull request #226 from helios-ag/composer

composer tweak, summernote helper blank line added and removed blank …

Author: helios-ag

README.md

@@ -48,7 +48,6 @@ Recommended bundles to use with:
     - [Integration with TinyMCE 3](/Resources/doc/tinymce-integration.md#tinymce-3x)
     - [Integration with TinyMCE 4](/Resources/doc/tinymce-integration.md#tinymce-4x)
 - [Summernote integration](/Resources/doc/summernote-integration.md)
-
 - [Advanced configuration](/Resources/doc/advanced-configuration.md)
     - [Custom configuration provider](/Resources/doc/advanced-configuration.md#custom-configuration-provider)
     - [Custom loader](/Resources/doc/advanced-configuration.md#custom-loader)

Resources/views/Elfinder/helper/_summernote.html.twig

@@ -7,4 +7,5 @@
             );
             return false;
         }
-</script>
+</script>
+

composer.json

@@ -20,12 +20,12 @@
       "exclude": ["/Tests"]
     },
     "require": {
-        "php":                                 ">=5.3.9",
+        "php":                                 ">=5.4",
         "symfony/framework-bundle":            "~2.4|~3.0",
         "symfony/twig-bundle":                 "~2.4|~3.0",
         "symfony/form":                        "~2.4|~3.0",
-        "helios-ag/fm-elfinder-php-connector": "~2.0",
-        "components/elfinder": "~2.0"
+        "helios-ag/fm-elfinder-php-connector": "~2.5",
+        "components/elfinder":                 "~2.1"
     },
     "require-dev" : {
         "symfony/phpunit-bridge": "~2.7|~3.0",
@@ -44,7 +44,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "6.0-dev"
+            "dev-master": "6.1-dev"
         }
     }
 }