Merge branch 'iv-org:master' into youtube-playlist-import

src/invidious/views/feeds/playlists.ecr

@@ -39,3 +39,5 @@
     <%= rendered "components/item" %>
 <% end %>
 </div>
+
+<script src="/js/watched_indicator.js"></script>

src/invidious/views/feeds/popular.ecr

@@ -16,3 +16,5 @@
     <%= rendered "components/item" %>
 <% end %>
 </div>
+
+<script src="/js/watched_indicator.js"></script>

src/invidious/views/feeds/subscriptions.ecr

@@ -62,6 +62,8 @@
 <% end %>
 </div>
 
+<script src="/js/watched_indicator.js"></script>
+
 <div class="pure-g h-box">
     <div class="pure-u-1 pure-u-lg-1-5">
         <% if page > 1 %>

src/invidious/views/feeds/trending.ecr

@@ -45,3 +45,5 @@
     <%= rendered "components/item" %>
 <% end %>
 </div>
+
+<script src="/js/watched_indicator.js"></script>