Skip to content

Commit

Permalink
Merge branch 'release/v3.0.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
enfoqueNativo committed Aug 15, 2017
2 parents 5ea205d + 2005c1e commit 229f2a7
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

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

[3.0.8](https://github.com/SIU-Toba/framework/tree/3.0.8) (2017-08-15):
- Elimino metodo constructor con formato PHP4.x de PHP_Highlight por incompatibilidad en PHP 5.6.x
- Actualizo Services_JSON: 1.0.3.3 por misma razón

[3.0.7](https://github.com/SIU-Toba/framework/tree/3.0.7) (2017-08-14):
- Agregado de método constructor a PHP_Highlight
- Se definen como estáticos varios métodos de toba_fecha
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.7
3.0.8
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"element-34/php-webdriver": "~1.12",
"siu-toba/text_highlighter": "~0.7",
"simplesamlphp/simplesamlphp": "~1.14",
"siu-toba/services_json": "^1.0.3.2",
"siu-toba/services_json": "^1.0.3.3",
"siu/rdi": "~0.9",
"siu/arai-json-migrator" : "~1.0",
"siu/arai-cli" : "~2.1",
Expand Down
4 changes: 0 additions & 4 deletions php/3ros/PHP_Highlight.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,6 @@ class PHP_Highlight
*
* @param bool $inline If inline styles rather than colors are to be used
*/
function PHP_Highlight($inline = false)
{
return $this->__construct($inline);
}

function __construct($inline = false)
{
Expand Down

0 comments on commit 229f2a7

Please sign in to comment.