diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-17 07:57:37 +0300 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-17 07:59:14 +0300 |
| commit | 524565eb40d8c20080d345be80610ccdea11d8af (patch) | |
| tree | e88043f856dde04ce4a43e1b5e904b1dbe2ad7bc /core/Container | |
| parent | c8c433b9d3afeaca87c3d85b184a2b29f5002d38 (diff) | |
| parent | 719114577f0a5a7962e37a250db3a8d76a1809b8 (diff) | |
Merge branch 'master' into log-refactoring-1
Conflicts:
composer.json
composer.lock
config/global.php
core/Container/StaticContainer.php
Diffstat (limited to 'core/Container')
| -rw-r--r-- | core/Container/StaticContainer.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Container/StaticContainer.php b/core/Container/StaticContainer.php index 6d0974cf1b..53092a87da 100644 --- a/core/Container/StaticContainer.php +++ b/core/Container/StaticContainer.php @@ -43,7 +43,7 @@ class StaticContainer return self::$container; } - public static function reset() + public static function clearContainer() { self::$container = null; } |