claudep/eds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:alazo/eds

Browse source
This commit is contained in:
alazo 2018-08-16 18:41:07 +02:00
commit 8042aec4c7
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
templates/cms/index.html
View file

@ -40,7 +40,11 @@
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>
<<<<<<< HEAD
<td class="l1 m">{{ M03.url_code }}</td> <td class="l1 m">{{ M03.url_code }}</td>
=======
<td class="l1 m">{{ M03.url_code|safe }}</td>
>>>>>>> 16e26b8c7b42ee21e911f85996bb7ac0a5d2eec3
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>