From 50c405c74acc97421a3523b3d8c58b38bc97fb74 Mon Sep 17 00:00:00 2001
From: Yoan Le Clanche <yoanl@pilotsystems.net>
Date: Mon, 31 May 2021 11:36:43 +0200
Subject: [PATCH] Fix merge issue

---
 teleforma/templates/teleforma/inc/media_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html
index 0d615686..37f03183 100644
--- a/teleforma/templates/teleforma/inc/media_list.html
+++ b/teleforma/templates/teleforma/inc/media_list.html
@@ -9,7 +9,7 @@
 </div>
     <table class="listing" width="100%">
     <tbody>
-        {% for media in course.media.all|from_course_type:type|from_period:period %}
+        {% for media in course.media.all|from_course_type:type|from_periods:period %}
          {% if media.is_published or user.is_staff and not list_view %}
           {% if media.type == 'webm' or media.type == 'mp4' %}
             <tr>
-- 
2.39.5