Jack fbef187400 Merge branch 'master' into metadata-version ... # Conflicts: # lbrynet/conf.py # lbrynet/lbrynet_daemon/LBRYDaemon.py		2016-07-21 16:45:41 -04:00
..
daemon_scripts	move towards better fees and metadata	2016-07-21 16:11:14 -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-21 16:45:41 -04:00
LBRYDaemonCLI.py	Revert to 2 params as isinstance cannot support 3+ (#69)	2016-07-13 22:44:02 -05:00
LBRYDaemonControl.py	Merge pull request #92 from lbryio/file-uploads	2016-07-20 22:37:08 -04:00
LBRYDaemonServer.py	disable debug logging	2016-07-20 22:40:55 -04:00
LBRYDownloader.py	Merge branch 'master' into metadata-version	2016-07-21 16:45:41 -04:00
LBRYPublisher.py	use asctime in logging format	2016-07-20 07:21:12 -05:00
LBRYUIManager.py	check every 30 minutes for a new ui version	2016-07-06 01:27:25 -04:00