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	Use a more up-to-date OSX version	2016-06-22 23:23:26 -05:00
lbry-osx-app	Merge branch 'master' into refactor-settings	2016-10-19 00:19:45 -04:00
add-key.sh	Enabling builds on travis-ci	2016-05-22 20:17:36 -05:00
install_lbry_source.sh	install script	2016-08-18 00:30:57 -04:00