Release 1.2.0.

gmazoyer · Feb 16, 2016 · 5ffb6df · 5ffb6df
1 parent c37f1e6
commit 5ffb6df
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## Version 1.2.0 | Convergence (New features release) | 2016-02-16
+
+  * Second feature release of 1.X.Y branch
+  * New configuration options to customize ping and traceroute commands for
+    BIRD and Quagga
+  * Rework hostname parameter check
+  * Embeds Bootstrap 3.3.6, jQuery 2.2.0 and phpseclib 1.0.1
+
 ## Version 1.1.0 | Convergence (New features release) | 2014-12-23
 
   * First feature release of 1.X.Y branch

diff --git a/includes/config.defaults.php b/includes/config.defaults.php
@@ -28,7 +28,7 @@
 
   // Release configuration
   'release' => array(
-    'version' => '1.1.0',
+    'version' => '1.2.0',
     'codename' => 'Convergence'
   ),