Merge remote-tracking branch 'origin/master' into dev

6 years ago · 3f6ca864a3
2 changed files with 2 additions and 1 deletions
--- a/app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java
+++ b/app/src/main/java/org/transdroid/daemon/Deluge/DelugeAdapter.java
@ -145,6 +145,7 @@ public class DelugeAdapter implements IDaemonAdapter {
 	private static final String PATH_TO_UPLOAD = "/upload";
 	private static final String RPC_ID = "id";
 	private final String RPC_METHOD_ADD_FILE = "web.add_torrents";
 	private DaemonSettings settings;
 	private DefaultHttpClient httpclient;
--- a/latest-search.html
+++ b/latest-search.html
@ -1 +1 @@
-32|3.9
+33|3.10