summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks/MergeFiles.py
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-06-08 06:08:01 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-06-08 06:08:01 +0200
commit0e1ef9bc01579328e17e79416fa3c1c7b77adcc8 (patch)
tree7254ea66d7efee78ececda3ab3eeeb6548b22bca /module/plugins/hooks/MergeFiles.py
parentMove base plugins to internal folder (diff)
downloadpyload-0e1ef9bc01579328e17e79416fa3c1c7b77adcc8.tar.xz
Update everything
Diffstat (limited to 'module/plugins/hooks/MergeFiles.py')
-rw-r--r--module/plugins/hooks/MergeFiles.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py
index 941938920..db7432eac 100644
--- a/module/plugins/hooks/MergeFiles.py
+++ b/module/plugins/hooks/MergeFiles.py
@@ -6,14 +6,14 @@ import os
import re
import traceback
-from module.plugins.Hook import Hook, threaded
+from module.plugins.internal.Hook import Hook, threaded
from module.utils import save_join
class MergeFiles(Hook):
__name__ = "MergeFiles"
__type__ = "hook"
- __version__ = "0.14"
+ __version__ = "0.15"
__config__ = [("activated", "bool", "Activated", True)]