Skip to content

Commit

Permalink
Merge branch 'release/v3.0.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
Andres Blanco committed Jul 24, 2017
2 parents 2d50f92 + a4b20bb commit 3101fb7
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 32 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

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

[3.0.6](https://github.com/SIU-Toba/framework/tree/3.0.6)
- Se actualiza arai-cli a la 2.1 que tiene ventana de preconfiguración

[3.0.5](https://github.com/SIU-Toba/framework/tree/3.0.5) (2017-07-07):
- Se agrega control a toba_nucleo por si la app no se inicializa en el acceso_rest
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.5
3.0.6
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"siu-toba/services_json": "^1.0.3.1",
"siu/rdi": "~0.9",
"siu/arai-json-migrator" : "~1.0",
"siu/arai-cli" : "~2.0",
"siu/arai-cli" : "~2.1",
"siu/jasper":"dev-master",
"vlucas/phpdotenv": "~2.0"
},
Expand Down
58 changes: 29 additions & 29 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion src/SIUToba/Arai/RegistryHooksProyectoToba.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ function __construct()
$this->instalacion = $this->cargarToba();
}

public function preConf(\Pimple\Container $container)
{
}

/**
* Se ejecuta antes de enviar una feature para consumo al registry.
* @param Consumption $consumption
Expand Down Expand Up @@ -485,4 +489,4 @@ public static function getAppUniqueId()
return null;
}
}
}
}

0 comments on commit 3101fb7

Please sign in to comment.