Merge branch 'public/7.7' into public/7.9

LMS-Community · Oct 16, 2019 · 8a9e9fb · 8a9e9fb
2 parents 7ffe9c2 + 3c1e708
commit 8a9e9fb
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 690 deletions.
diff --git a/Changelog7.html b/Changelog7.html
@@ -292,6 +292,7 @@ <h2><a name="v7.7.7" id="v7.7.7"></a>Version 7.7.7</h2>
 <ul>
 	<li>Server Changes:</li>
 	<ul>
+		<li>Remove defunct Live365 and Flickr plugins.</li>
 	</ul>
 	<br />
 

diff --git a/Slim/Plugin/Flickr/HTML/EN/plugins/Flickr/html/images/icon.png b/Slim/Plugin/Flickr/HTML/EN/plugins/Flickr/html/images/icon.png
diff --git a/Slim/Plugin/Flickr/HTML/EN/plugins/Flickr/html/images/icon_40x40_m.png b/Slim/Plugin/Flickr/HTML/EN/plugins/Flickr/html/images/icon_40x40_m.png
diff --git a/Slim/Plugin/Flickr/Plugin.pm b/Slim/Plugin/Flickr/Plugin.pm
diff --git a/Slim/Plugin/Flickr/install.xml b/Slim/Plugin/Flickr/install.xml
diff --git a/Slim/Plugin/Flickr/strings.txt b/Slim/Plugin/Flickr/strings.txt
diff --git a/Slim/Plugin/Live365/HTML/EN/plugins/Live365/html/images/icon.png b/Slim/Plugin/Live365/HTML/EN/plugins/Live365/html/images/icon.png
diff --git a/Slim/Plugin/Live365/HTML/EN/plugins/Live365/html/images/icon_40x40_m.png b/Slim/Plugin/Live365/HTML/EN/plugins/Live365/html/images/icon_40x40_m.png
diff --git a/Slim/Plugin/Live365/Plugin.pm b/Slim/Plugin/Live365/Plugin.pm
-Original file line number
+Diff line change
@@ Expand Up / @@ -292,6 +292,7 @@ <h2><a name="v7.7.7" id="v7.7.7"></a>Version 7.7.7</h2> @@
     <ul>
     	<li>Server Changes:</li>
     	<ul>
+    		<li>Remove defunct Live365 and Flickr plugins.</li>
     	</ul>
     	<br />
@@ Expand Down @@