Merge branch 'master' into add-detail-page

# Conflicts: # dist.zip
2016-07-19 00:41:27 -05:00 · 2016-07-19 00:41:27 -05:00 · cc28af2436
commit cc28af2436
parent 50de564183 b298dc889a
2 changed files with 2 additions and 2 deletions
--- a/dist.zip
+++ b/dist.zip
--- a/js/app.js
+++ b/js/app.js
@ -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';
        };
      });
    });