Jack 6799de645b Merge branch 'master' into refactor-settings ... # Conflicts: # packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py # packaging/windows/lbry-win32-app/LBRYWin32App.py		2016-10-19 00:19:45 -04:00
..
osx	Merge branch 'master' into refactor-settings	2016-10-19 00:19:45 -04:00
travis	Remove all unused imports; add check to pylint	2016-08-08 15:42:35 -05:00
ubuntu	Bump version: 0.6.6 → 0.6.7	2016-10-16 02:55:19 -04:00
uri_handler	--http-auth flag to use authentication, refactor settings	2016-10-19 00:12:44 -04:00
windows	Merge branch 'master' into refactor-settings	2016-10-19 00:19:45 -04:00
__init__.py	move uri handler to packaging/uri_handler	2016-08-28 01:10:28 -04:00