Cut release from staging #793

Merged
skhameneh merged 3 commits from staging into release 2018-11-30 17:12:52 +01:00

3 commits

Author SHA1 Message Date
Shawn K
7ddb403f6e
Merge pull request #792 from lbryio/master
Cut staging from master
2018-11-30 10:10:00 -06:00
Shawn K
41de5350b7
Merge pull request #747 from jessopb/sensitiveKeys
moves sensitive keys to gitignored folder
2018-11-30 09:45:45 -06:00
Jessop Breth
63bf01971d moves sensitive keys to gitignored folder 2018-11-15 11:29:30 -05:00