Merge branch 'release/2.10'

OpenConext · Nov 7, 2019 · 8f62780 · 8f62780
2 parents 945e18d + 2f7323f
commit 8f62780
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,8 +27,13 @@ before_script:
 script:
   - ant
 
-
 branches:
   only:
     - master
     - develop
+    - release/2.10
+
+addons:
+  apt:
+    packages:
+      - ant
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.10.7
+This is a security release that will harden the application against CVE 2019-346
+ * Upgrade xmlseclibs to version 3.0.4 #175
+
 ## 2.10.6
 **Bugfix**
  * Create a pdf base template to support local url's #168

diff --git a/composer.lock b/composer.lock