8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-05 01:16:27 +00:00

Fix merge crans et end sub mail

This commit is contained in:
Grizzly 2018-07-01 16:53:41 +00:00
parent 81c78685d3
commit 53ed7989b7
3 changed files with 17 additions and 2 deletions

View file

@ -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 = [
]

View file

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

View file

@ -40,7 +40,7 @@ from django.db import transaction
from reversion import revisions as reversion from reversion import revisions as reversion
from re2o.views import form 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 MailContactForm, DelMailContactForm
from .forms import ServiceForm, ReminderForm from .forms import ServiceForm, ReminderForm