Merge remote-tracking branch 'origin/master' into i18n

This commit is contained in:
Jeremy Kauffman 2016-08-03 05:41:07 -04:00
commit ebd23c4810
3 changed files with 5 additions and 8 deletions

View file

@ -83,6 +83,10 @@ class Controller
case '/lbry-linux-latest.deb':
case '/dl/lbry_setup.sh':
return static::redirect('/get', 301);
case '/get/lbry.dmg':
return static::redirect(DownloadActions::getDownloadUrl(DownloadActions::OS_OSX));
case '/get/lbry.deb':
return static::redirect(DownloadActions::getDownloadUrl(DownloadActions::OS_LINUX));
case '/art':
return static::redirect('/what', 301);
case '/why':

View file

@ -187,7 +187,7 @@ class DownloadActions extends Actions
return null;
}
protected static function getDownloadUrl($os, $useCache = true)
public static function getDownloadUrl($os, $useCache = true)
{
if (!in_array($os, array_keys(static::getOses())))
{

View file

@ -1,7 +0,0 @@
---
author: jeremy
title: LBRY Promo Video Raw Footage
date: '2015-08-06 17:08:53'
---
<iframe width="770" height="433" src="https://www.youtube.com/embed/5HSKK1tbD-o" frameborder="0" allowfullscreen style="margin-left: auto; margin-right: auto"></iframe>