1
0
mirror of https://github.com/moparisthebest/SickRage synced 2024-08-13 16:53:54 -04:00

Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	sickbeard/config.py
This commit is contained in:
echel0n 2014-12-21 04:42:35 -08:00
commit 978fe5bb63

View File

@ -458,7 +458,7 @@ class ConfigMigrator():
3: 'Rename omgwtfnzb variables',
4: 'Add newznab catIDs',
5: 'Metadata update',
6: 'Convert from XBMC to XBMC variables'
6: 'Convert from XBMC to new KODI variables'
}
def migrate_config(self):