Fix merge crans et end sub mail

preferences/migrations/0039_merge_20180701_1852.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-07-01 16:52
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0035_reminder'),
+        ('preferences', '0038_mailcontact'),
+    ]
+
+    operations = [
+    ]

preferences/templates/preferences/display_preferences.html

@@ -85,7 +85,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 		<th>Nombre d'alias maximum</th>
 		<td>{{ useroption.max_mail_alias }}<td>
 	</tr>
-        {% endfor %}
     </table>
 
     <h4>Préférences machines</h4>

preferences/views.py

@@ -40,7 +40,7 @@ from django.db import transaction
 from reversion import revisions as reversion
 
 from re2o.views import form
-from re2o.acl import can_create, can_edit, can_delete, can_view_all
+from re2o.acl import can_create, can_edit, can_delete, can_delete_set, can_view_all
 
 from .forms import MailContactForm, DelMailContactForm
 from .forms import ServiceForm, ReminderForm