diff options
| author | diosmosis <benaka@piwik.pro> | 2015-03-17 04:45:40 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2015-03-17 04:45:40 +0300 |
| commit | 5228a8ef9256b4982d27dd9a01495fb4de6dfff1 (patch) | |
| tree | b3541de3a145fa49cbcb432637c0ea513b67e5c3 /plugins | |
| parent | f68c136917a0c976d4c8d8642a661009361013a1 (diff) | |
| parent | 42807de32ab64bef2c18eb1f6a6d0a0358f8c57f (diff) | |
Merge branch 'master' into 7276_update_command_progress
Conflicts:
plugins/CoreUpdater/Commands/Update.php
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CoreUpdater/Commands/Update.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/CoreUpdater/Commands/Update.php b/plugins/CoreUpdater/Commands/Update.php index 07d12cada3..0f5566e394 100644 --- a/plugins/CoreUpdater/Commands/Update.php +++ b/plugins/CoreUpdater/Commands/Update.php @@ -332,4 +332,4 @@ class Update extends ConsoleCommand return $updater; } -}
\ No newline at end of file +} |