]> git.parisson.com Git - teleforma.git/commit
Fix merge issues
authorYoan Le Clanche <yoanl@pilotsystems.net>
Wed, 2 Dec 2020 12:48:01 +0000 (13:48 +0100)
committerYoan Le Clanche <yoanl@pilotsystems.net>
Wed, 2 Dec 2020 12:48:01 +0000 (13:48 +0100)
commit573f78299b6964f663b542b11809b6638d8a104f
treebeb11965099b2c558f5a55c77f084fc11cd71083
parent2a1e1c0d6a99d70c06e1b50ad0e2419503a7671e
Fix merge issues
teleforma/templates/teleforma/inc/media_list.html