summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Mazoyer <gmazoyer@gravitons.in>2016-02-16 22:16:30 +0100
committerGuillaume Mazoyer <gmazoyer@gravitons.in>2016-02-16 22:16:30 +0100
commit5ffb6dfcab5af89fc467eefbfceb6e192b97aa5b (patch)
tree510b78cfd6db3ee672b4f5a102c9b4aa44971d3f
parentc37f1e6e9b01af8eeafae8ab913026d55fd20747 (diff)
Release 1.2.0.looking-glass-1.2.0
-rw-r--r--CHANGELOG.md8
-rw-r--r--includes/config.defaults.php2
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7024636..5b46ca0 100644
--- 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
index 0fbca1a..9b7defe 100644
--- a/includes/config.defaults.php
+++ b/includes/config.defaults.php
@@ -28,7 +28,7 @@ $config = array(
// Release configuration
'release' => array(
- 'version' => '1.1.0',
+ 'version' => '1.2.0',
'codename' => 'Convergence'
),