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
..
certs	fix file	2016-08-31 23:09:01 -04:00
lbry-win32-app	Merge branch 'master' into refactor-settings	2016-10-19 00:19:45 -04:00
libs	Add gmpy windows wheel	2016-08-16 18:01:18 -04:00
init.ps1	add jsonschema to windows build	2016-10-16 00:29:32 -04:00
install.ps1	appveyor updates	2016-09-28 07:38:12 -07:00
test.ps1	appveyor updates	2016-09-28 07:38:12 -07:00