Cut staging from master #848

Merged
skhameneh merged 2 commits from master into staging 2018-12-19 23:22:36 +01:00

2 commits

Author SHA1 Message Date
Shawn K
1d00891c64
Merge pull request #847 from jessopb/getClaimPreviewData
reduces channel loadtimes, fixes fallback fileExt
2018-12-19 16:19:13 -06:00
jessop
05b7a4eb62 reduces channel loadtimes, fixes fallback fileExt 2018-12-19 03:22:28 -05:00