Jack 5a0b5dc680 Merge branch 'master' into auth-jsonrpc ... # Conflicts: # lbrynet/lbrynet_daemon/Daemon.py # lbrynet/lbrynet_daemon/DaemonControl.py		2016-10-07 17:11:43 -04:00
..
osx	update app imports	2016-09-30 11:17:47 -04:00
travis	Remove all unused imports; add check to pylint	2016-08-08 15:42:35 -05:00
ubuntu	Bump version: 0.6.2 → 0.6.3	2016-10-02 03:33:12 -04:00
uri_handler	update uri handler	2016-09-21 21:55:10 -04:00
windows	fix broken windows import	2016-09-30 11:26:37 -04:00
__init__.py	move uri handler to packaging/uri_handler	2016-08-28 01:10:28 -04:00