Kevin Midboe 9e80cc4d97 Mixed merge conflict.

2018-09-20 23:27:57 +02:00

..

core.py

Mixed merge conflict.

2018-09-20 23:27:57 +02:00

env_variables.py

Renamed seasonedParser subfolder to src

2018-09-14 19:18:59 +02:00

pirateSearch.py

Renamed seasonedParser subfolder to src

2018-09-14 19:18:59 +02:00

scandir.py

Renamed seasonedParser subfolder to src

2018-09-14 19:18:59 +02:00

seasonGuesser.py

Renamed seasonedParser subfolder to src

2018-09-14 19:18:59 +02:00

seasonMover.py

Renamed seasonedParser subfolder to src

2018-09-14 19:18:59 +02:00

subtitle.py

Disabled import of langdetect library

2018-09-14 19:32:24 +02:00

tvdb.py

Renamed seasonedParser subfolder to src

2018-09-14 19:18:59 +02:00

utils.py

Video gets a new parameter embeded_subtitles to represent the subtitle files found in the mkv container.

2018-09-16 23:26:06 +02:00

video.py

Conflict resolved by re-adding release_group

2018-09-16 23:46:39 +02:00

walk.py

Renamed seasonedParser subfolder to src

2018-09-14 19:18:59 +02:00

watcher.py

Renamed seasonedParser subfolder to src

2018-09-14 19:18:59 +02:00