Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts: view/it/messages.po view/it/strings.php
2015-08-03 21:17:00 -07:00
parent b737e224b1 56045093cc
commit f594a7776c
3 changed files with 4 additions and 3 deletions
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -95,7 +95,8 @@ function oembed_fetch_url($embedurl){
 		Cache::set($a->videowidth . $embedurl,$txt);

 	}
-	
+
+
 	$j = json_decode($txt);
 	$j->embedurl = $embedurl;
 	return $j;