From 2586b6a282c4855e1e789d212c63395284a40748 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Thu, 15 Dec 2016 16:09:35 +0100
Subject: [PATCH] Prepare version 0.7.0

---
 CHANGELOG.md  | 2 +-
 composer.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b6e178..78aeb46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Updated changelog to follow [keepachangelog.com](http://keepachangelog.com/)
   style you see now here.
 
-[0.7.0] - 2016-xx-xx
+[0.7.0] - 2016-12-15
 --------------------
 
 - Add support for FFMpeg 3 aac codec (@Nek-)
diff --git a/composer.json b/composer.json
index 6527383..7e2babf 100644
--- a/composer.json
+++ b/composer.json
@@ -48,7 +48,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.6-dev"
+            "dev-master": "0.7-dev"
         }
     }
 }