Merge branch 'master' into noconv

This commit is contained in:
Pierre Rudloff 2014-07-05 12:49:43 +02:00
commit da08ce51aa
4 changed files with 40 additions and 17 deletions

View file

@ -10,7 +10,6 @@
* @license GNU General Public License http://www.gnu.org/licenses/gpl.html
* @link http://rudloff.pro
* */
$python="/usr/bin/python";
require_once 'download.php';
if (isset($_GET["url"])) {
if (isset($_GET["format"])) {