Merge remote-tracking branch 'origin/develop'

This commit is contained in:
Pieter Janssens
2014-08-05 13:05:46 +02:00
2 changed files with 5 additions and 3 deletions

5
.gitignore vendored
View File

@@ -28,8 +28,9 @@ ehthumbs.db
Icon?
Thumbs.db
#ignore thumbnails created by windows
Thumbs.db
#Ignore files generated by PyCharm
.idea/*
#Ignore files build by Visual Studio
*.obj
*.exe

View File

@@ -395,7 +395,7 @@
<input type="checkbox" name="use_mininova" value="1" ${config['use_mininova']} /><label>Mininova</label>
</div>
<div class="row checkbox">
<input type="checkbox" name="use_kat" value="1" ${config['use_kat']} /><label>Kick Ass Torrents</label>
<input id="usekat" type="checkbox" name="use_kat" value="1" ${config['use_kat']} /><label>Kick Ass Torrents</label>
</div>
<div class="config">
<div class="row">
@@ -1742,6 +1742,7 @@
initConfigCheckbox("#usenewznab");
initConfigCheckbox("#usenzbsorg");
initConfigCheckbox("#useomgwtfnzbs");
initConfigCheckbox("#usekat");
initConfigCheckbox("#usepiratebay");
initConfigCheckbox("#usewaffles");
initConfigCheckbox("#userutracker");