Commit graph

3 commits

Author SHA1 Message Date
clinton-hall
da09af8de7 Merge branch 'dev' of http://github.com/clinton-hall/nzbToMedia into dev
Conflicts:
	TorrentToMedia.py
	autoProcess/autoProcessTV.py
	autoProcess/migratecfg.py
	nzbToMedia.py
	nzbToSickBeard.py
	nzbtomedia/nzbToMediaAutoFork.py
2014-04-04 15:43:00 +10:30
echel0n
8e7490ff80 Changed r.content to r.text 2014-04-03 21:08:51 -07:00
echel0n
85d8739512 Major overhaul of nzbToMedia code base plus a whole restrucure 2014-04-03 19:58:01 -07:00