Merge branch 'public/7.7' into public/8.1

# Conflicts: # Slim/Player/Squeezebox2.pm # Slim/Plugin/MOG/HTML/EN/plugins/MOG/html/images/icon.png # Slim/Plugin/MOG/Plugin.pm # Slim/Plugin/MOG/ProtocolHandler.pm # Slim/Plugin/MOG/install.xml # Slim/Plugin/MOG/strings.txt
LMS-Community · Jan 30, 2021 · e060e09 · e060e09
2 parents c28ded8 + 58105fe
commit e060e09
Show file tree

Hide file tree

Showing 7 changed files with 94 additions and 959 deletions.
diff --git a/Changelog7.html b/Changelog7.html
@@ -351,7 +351,7 @@ <h2><a name="v7.7.7" id="v7.7.7"></a>Version 7.7.7</h2>
 	<li>Server Changes:</li>
 	<ul>
 		<li>Don't hard-code the Pandora bitrate.</li>
-		<li>Remove defunct Live365 and Flickr plugins.</li>
+		<li>Remove defunct MOG, Live365 and Flickr plugins.</li>
 	</ul>
 	<br />