Merge pull request #315 from Nyholm/release

Prepare for release 1.2.1
schmittjoh · Mar 23, 2016 · f09499f · f09499f
2 parents ec00a03 + 2805a44
commit f09499f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ sudo: false
 
 cache:
     directories:
-        - $HOME/.composer/cache/files
+        - $HOME/.composer/cache
 
 php:
   - 5.3

diff --git a/Changelog.md b/Changelog.md
@@ -1,12 +1,16 @@
 # Changelog
 
 
+### 1.2.1 to next release
 
-### 1.2 to 1.3
+
+### 1.2.0 to 1.2.1
 
 * New maintainers: @gnat42, @gouaille and @nyholm.
-* Updated Jquery from 1.6.1 to 1.12.0
+* Updated Jquery from 1.6.1 to 1.12.0.
 * Dropping support for Symfony 2.1, 2.2, 2.4, 2.5 and 2.6.
+* Removed the requirement on Twig text extension.
+* Removed use of the deprecated `Symfony\Component\HttpKernel\Log\LoggerInterface` in favor for `Psr\Log\LoggerInterface`. 
 
 ### 1.1 to 1.2
 

diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
     "target-dir": "JMS/TranslationBundle",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.3-dev"
         }
     }
 }