Skip to content

Commit

Permalink
Merge branch 'release/v3.1.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
enfoqueNativo committed Nov 16, 2018
2 parents 8c546bc + 1cecdf3 commit 308b829
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

[CURRENT](https://github.com/SIU-Toba/framework/compare/master...develop)

[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

[3.1.3](https://github.com/SIU-Toba/framework/releases/tag/v3.1.3) (2018-10-29)
- Bugfix en toba_analizador_logger, se invocaba mal una variable estatica

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.3
3.1.4
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"siu-toba/Structures_Graph": "^1.1.1.1",
"phpmailer/phpmailer": "^6.0",
"siu-toba/text_highlighter": "~0.8",
"simplesamlphp/simplesamlphp": "~1.14",
"siu-toba/services_json": "^1.0.3.3",
"siu/rdi": "~0.9",
"vlucas/phpdotenv": "~2.0",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "siu-toba-framework",
"version": "3.1.3",
"version": "3.1.4",
"description": "Framework para desarrollo rápido de aplicaciones web",
"license": "SEE LICENSE IN licencia.txt",
"repository": "https://github.com/SIU-Toba/framework.git",
Expand Down

0 comments on commit 308b829

Please sign in to comment.