2 commits

Author	SHA1	Message	Date
Job Evers-Meltzer	0edacbe4c8	Merge remote-tracking branch 'origin/master' into refactor-settings ... Conflicts: lbrynet/conf.py lbrynet/lbrynet_daemon/Daemon.py lbrynet/lbrynet_daemon/DaemonCLI.py lbrynet/lbrynet_daemon/UIManager.py tests/functional/test_misc.py	2016-10-27 10:18:56 -05:00
Job Evers-Meltzer	bfcfa9dc3c	cleanup tests to improve readability	2016-10-20 09:30:08 -07:00