Jack 71b989b29b update from master ... resolve merge conflicts: lbrynet/core/client/BlobRequester.py lbrynet/core/Peer.py lbrynet/lbryfilemanager/EncryptedFileManager.py lbrynet/lbrynet_daemon/Daemon.py lbrynet/lbrynet_daemon/Publisher.py		2016-09-29 23:34:59 -04:00
..
plugins	Remove LBRY prefix from class and module names	2016-09-27 11:18:35 -07:00
__init__.py	initial commit	2015-08-20 11:27:15 -04:00
Console.py	Remove LBRY prefix from class and module names	2016-09-27 11:18:35 -07:00
ConsoleControl.py	update documentation to reflect using lbryum by default	2016-03-09 12:26:07 -05:00
ControlHandlers.py	update from master	2016-09-29 23:34:59 -04:00
interfaces.py	change the console ui to command based rather than option based	2015-10-15 14:12:22 -04:00
Plugin.py	Remove LBRY prefix from class and module names	2016-09-27 11:18:35 -07:00
Settings.py	Remove LBRY prefix from class and module names	2016-09-27 11:18:35 -07:00