[MERGE] forward port branch 10.0 up to 72fa3e8bda

2017-03-28 17:27:19 +02:00
parent 55895c7de1 72fa3e8bda
commit 2f68e9e93a
118 changed files with 2850 additions and 577 deletions
@@ -88,7 +88,7 @@
                    </tr>
                </table>
            </td></tr>
-            <tr><td style="padding:15px 20px 10px 20px;">${object.user_id.signature or ''| safe}</td></tr>
+            <tr><td style="padding:15px 20px 10px 20px;">${(object.user_id.signature or '')| safe}</td></tr>
        </tbody>
    </table>
    <table style="width:600px;margin:auto;text-align:center;font-size:12px;">