Jack 9572336e96 Merge branch 'master' into metadata-version ... # Conflicts: # lbrynet/core/utils.py # lbrynet/lbrynet_daemon/LBRYDaemon.py		2016-07-27 03:54:10 -04:00
..
daemon_scripts	remove fee checking from autofetcher script	2016-07-25 22:28:01 -04:00
__init__.py	don't mess with logging	2016-06-07 04:19:51 -04:00
LBRYDaemon.py	Merge branch 'master' into metadata-version	2016-07-27 03:54:10 -04:00
LBRYDaemonCLI.py	Revert to 2 params as isinstance cannot support 3+ (#69)	2016-07-13 22:44:02 -05:00
LBRYDaemonControl.py	Fix: Log configuration should not happen when a module is imported	2016-07-26 12:01:03 -05:00
LBRYDaemonServer.py	fix conflicts	2016-07-27 03:48:32 -04:00
LBRYDownloader.py	fix conflicts	2016-07-27 03:48:32 -04:00
LBRYPublisher.py	fix conflicts	2016-07-27 03:48:32 -04:00
LBRYUIManager.py	Merge pull request #100 from lbryio/change-ui-location	2016-07-27 03:44:28 -04:00