Merge the network and network_proxy

2015-08-30 21:18:10 +09:00
parent 4d6a0f29ee
commit 2d05e7d891
14 changed files with 158 additions and 319 deletions
--- a/lib/init.py
+++ b/lib/init.py
@@ -11,4 +11,3 @@ import transaction
 from transaction import Transaction
 from plugins import BasePlugin
 from commands import Commands, known_commands
-from network_proxy import NetworkProxy