Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2018-10-09 22:21:48 +02:00
commit bd90725d6a
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -11,10 +11,10 @@
<!-- BEGIN bans --> <!-- BEGIN bans -->
ban_length['{bans.BAN_ID}'] = '{bans.A_LENGTH}'; ban_length['{bans.BAN_ID}'] = '{bans.A_LENGTH}';
<!-- IF bans.A_REASON --> <!-- IF bans.A_REASON -->
ban_reason['{bans.BAN_ID}'] = '{bans.A_REASON}'; ban_reason['{bans.BAN_ID}'] = '{{ bans.A_REASON | e('js') }}';
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF bans.A_GIVE_REASON --> <!-- IF bans.A_GIVE_REASON -->
ban_give_reason['{bans.BAN_ID}'] = '{bans.A_GIVE_REASON}'; ban_give_reason['{bans.BAN_ID}'] = '{{ bans.A_GIVE_REASON | e('js') }}';
<!-- ENDIF --> <!-- ENDIF -->
<!-- END bans --> <!-- END bans -->