Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/zolicss

This commit is contained in:
Qwann 2016-07-12 16:00:24 +02:00
commit 7ccf44bef7

View file

@ -1,7 +1,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations
def create_mail(apps, schema_editor): def create_mail(apps, schema_editor):
CustomMail = apps.get_model("gestioncof", "CustomMail") CustomMail = apps.get_model("gestioncof", "CustomMail")
@ -19,10 +20,11 @@ def create_mail(apps, schema_editor):
+ "{{ prenom }} \t prénom de la personne.") + "{{ prenom }} \t prénom de la personne.")
]) ])
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('gestioncof', '0002_enable_unprocessed_demandes'), ('gestioncof', '0003_event_image'),
] ]
operations = [ operations = [