Merge branch 'release/v3.1.5'

SIU-Toba · Dec 7, 2018 · b708a05 · b708a05
2 parents 308b829 + bf62417
commit b708a05
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 544 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 [CURRENT](https://github.com/SIU-Toba/framework/compare/master...develop)
 
+[3.1.5](https://github.com/SIU-Toba/framework/releases/tag/v3.1.5) (2018-12-07)
+- Fix en verificacion de versiones compatibles de Arai (merge desde develop)
+- Acualizacion de seguridad de librerias:
+  * phpmailer/phpmailer: v6.0.6
+  * phpoffice/phpspreadsheet: v1.5.1
+
 [3.1.4](https://github.com/SIU-Toba/framework/releases/tag/v3.1.4) (2018-11-16)
 - Quita el paquete simplesamlphp/simplesamlphp del requiere en composer
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.1.4
+3.1.5