Cut staging from master #803

Merged

skhameneh merged 4 commits from master into staging

2018-12-03 22:58:51 +01:00

Author	SHA1	Message	Date
Shawn K	af24a11ca2	Merge pull request #801 from jessopb/AssetInfo adds LBRY and Permanent URLS to info component	2018-12-03 15:58:14 -06:00
Shawn K	dab56b47d1	Merge pull request #802 from lbryio/fix-custom-css Fix SCSS overrides for site/custom	2018-12-03 15:37:02 -06:00
Shawn	7288b1f541	Fix SCSS overrides for site/custom	2018-12-03 15:32:57 -06:00
jessop	267db2d614	adds LBRY and Permanent URLS to info component	2018-12-03 12:58:00 -05:00