Cut staging from master #685

Merged
skhameneh merged 4 commits from master into staging 2018-11-07 23:05:52 +01:00

4 commits

Author SHA1 Message Date
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