Merge branch 'master' into add-detail-page

# Conflicts:
#	dist.zip
This commit is contained in:
Jonas Whidden 2016-07-19 00:41:27 -05:00
commit cc28af2436
2 changed files with 2 additions and 2 deletions

BIN
dist.zip

Binary file not shown.

View file

@ -36,7 +36,7 @@ var App = React.createClass({
if (window.confirm(message)) {
lbry.stop();
window.location = 'http://www.lbry.io/get';
window.location = 'https://lbry.io/get';
};
});
});
@ -62,4 +62,4 @@ var App = React.createClass({
return <DetailPage name={this.state.pageArgs}/>;
}
}
});
});