From 998761a554a59540576129cceb88745d35f63074 Mon Sep 17 00:00:00 2001
From: LogansUA <logansoleg@gmail.com>
Date: Tue, 29 Mar 2016 15:07:40 +0300
Subject: [PATCH] Prepare for v2.0 release

---
 Twig/Extension/StfalconTinymceExtension.php | 4 ++--
 composer.json                               | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Twig/Extension/StfalconTinymceExtension.php b/Twig/Extension/StfalconTinymceExtension.php
index fb716edc..6fb3dcfb 100644
--- a/Twig/Extension/StfalconTinymceExtension.php
+++ b/Twig/Extension/StfalconTinymceExtension.php
@@ -94,7 +94,7 @@ public function tinymceInit($options = array())
         unset($config['asset_package_name']);
 
         /** @var $assets \Symfony\Component\Templating\Helper\CoreAssetsHelper */
-        $assets = $this->getService('templating.helper.assets');
+        $assets = $this->getService('assets.packages');
 
         // Get path to tinymce script for the jQuery version of the editor
         if ($config['tinymce_jquery']) {
@@ -204,7 +204,7 @@ public function getName()
     protected function getAssetsUrl($inputUrl)
     {
         /** @var $assets \Symfony\Component\Templating\Helper\CoreAssetsHelper */
-        $assets = $this->getService('templating.helper.assets');
+        $assets = $this->getService('assets.packages');
 
         $url = preg_replace('/^asset\[(.+)\]$/i', '$1', $inputUrl);
 
diff --git a/composer.json b/composer.json
index 6d462626..3b64025d 100644
--- a/composer.json
+++ b/composer.json
@@ -33,5 +33,10 @@
             "Stfalcon\\Bundle\\TinymceBundle": ""
         }
     },
-    "target-dir" : "Stfalcon/Bundle/TinymceBundle"
+    "target-dir" : "Stfalcon/Bundle/TinymceBundle",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.x-dev"
+        }
+    }
 }