From 8c3e44f9aeeac1f8c163638a4cf75e02cc533cd9 Mon Sep 17 00:00:00 2001 From: Al Ganiev Date: Sat, 27 Feb 2016 18:09:31 +1000 Subject: [PATCH] composer tweak, summernote helper blank line added and removed blank line from TOC Readme --- README.md | 1 - Resources/views/Elfinder/helper/_summernote.html.twig | 3 ++- composer.json | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b587e89..f86e06c 100644 --- a/README.md +++ b/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) diff --git a/Resources/views/Elfinder/helper/_summernote.html.twig b/Resources/views/Elfinder/helper/_summernote.html.twig index abe8b3b..a052095 100644 --- a/Resources/views/Elfinder/helper/_summernote.html.twig +++ b/Resources/views/Elfinder/helper/_summernote.html.twig @@ -7,4 +7,5 @@ ); return false; } - \ No newline at end of file + + diff --git a/composer.json b/composer.json index d73af70..f766a81 100644 --- a/composer.json +++ b/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" } } }