Cut staging from master #695

Merged
skhameneh merged 7 commits from master into staging 2018-11-08 22:31:07 +01:00

7 commits

Author SHA1 Message Date
Shawn K
fcf2534bc2
Merge pull request #694 from lbryio/route-order
move pages to last in route order
2018-11-08 16:29:46 -05:00
Travis Eden
074e88b268 move pages to last in route order 2018-11-08 16:14:31 -05:00
Jeremy Kauffman
f03fcc04d7
remove unnecessary file 2018-11-08 16:13:20 -05:00
Jeremy Kauffman
538cffc08c
Merge pull request #692 from jessopb/configFix
fixes missing amount at configure
2018-11-08 15:08:42 -05:00
Jessop Breth
aec72143de fixes missing amount at configure 2018-11-08 14:58:41 -05:00
Shawn K
d15e2ce9d1
Merge pull request #688 from lbryio/fixPackageVer
Fix outdated dependency
2018-11-07 18:08:00 -05:00
Shawn
e962bb23de Fix outdated dependency 2018-11-07 18:06:56 -05:00