Jack 71c4dba34d Merge branch 'development' into jsonrpc ... # Conflicts: # setup.py		2016-03-23 22:34:27 -04:00
..
Apps	have uri handler check if app is running	2016-03-23 19:49:14 -04:00
__init__.py	LBRYNet daemon	2015-12-06 17:32:17 -05:00
LBRYDaemon.py	merge updates	2016-03-23 22:27:48 -04:00
LBRYDaemonControl.py	use UI downloaded to temp folder at startup	2016-03-22 10:37:13 -04:00
LBRYDownloader.py	update daemon and console	2016-03-17 10:19:36 -04:00
LBRYPublisher.py	fix files	2016-03-17 00:44:04 -04:00