Cut new release from staging #686

Merged

skhameneh merged 5 commits from staging into release

2018-11-07 23:06:31 +01:00

Author	SHA1	Message	Date
Shawn K	6d7c1b5c87	Merge pull request #685 from lbryio/master Cut staging from master	2018-11-07 17:05:52 -05:00
Shawn K	d4402efcfb	Merge pull request #684 from lbryio/singleConfigDir Update CLI configuration	2018-11-07 17:04:42 -05:00
Shawn	651d1cc9db	Update CLI configuration	2018-11-07 17:03:17 -05:00
Shawn K	052bfb5842	Merge pull request #683 from lbryio/singleConfigDir Update .gitignore	2018-11-07 16:39:13 -05:00
Shawn	2e5b733059	Update .gitignore	2018-11-07 16:38:34 -05:00