]> git.parisson.com Git - teleforma.git/commit
Fix merge issue
authorYoan Le Clanche <yoanl@pilotsystems.net>
Mon, 31 May 2021 09:36:43 +0000 (11:36 +0200)
committerYoan Le Clanche <yoanl@pilotsystems.net>
Mon, 31 May 2021 09:36:43 +0000 (11:36 +0200)
commit50c405c74acc97421a3523b3d8c58b38bc97fb74
treedbd032d3373ec7503f6a2648927a93d0d9e4cac4
parent7941f9d8f97fd79ab1acec8d4ed5e9147382a74d
Fix merge issue
teleforma/templates/teleforma/inc/media_list.html