From b052e97663f6a28274d59d37229f4fd5c5c63765 Mon Sep 17 00:00:00 2001 From: Hugo Levy--Falk Date: Tue, 20 Mar 2018 20:07:57 +0100 Subject: [PATCH 1/2] fixe la migration de preferences --- .../migrations/0030_merge_20180320_1419.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 preferences/migrations/0030_merge_20180320_1419.py diff --git a/preferences/migrations/0030_merge_20180320_1419.py b/preferences/migrations/0030_merge_20180320_1419.py new file mode 100644 index 00000000..90d70370 --- /dev/null +++ b/preferences/migrations/0030_merge_20180320_1419.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.7 on 2018-03-20 13:19 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('preferences', '0029_auto_20180318_1005'), + ('preferences', '0029_auto_20180318_0213'), + ] + + operations = [ + ] From 7be0b9890535745c2886d00e084a2662050c8bcc Mon Sep 17 00:00:00 2001 From: Gabriel Detraz Date: Thu, 22 Mar 2018 18:29:45 +0100 Subject: [PATCH 2/2] Change le mode de chsh --- .../migrations/0030_merge_20180319_0149.py | 16 ---------------- users/management/commands/chsh.py | 0 2 files changed, 16 deletions(-) delete mode 100644 preferences/migrations/0030_merge_20180319_0149.py mode change 100755 => 100644 users/management/commands/chsh.py diff --git a/preferences/migrations/0030_merge_20180319_0149.py b/preferences/migrations/0030_merge_20180319_0149.py deleted file mode 100644 index 7330e73a..00000000 --- a/preferences/migrations/0030_merge_20180319_0149.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.7 on 2018-03-19 00:49 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('preferences', '0029_auto_20180318_1005'), - ('preferences', '0029_auto_20180318_0213'), - ] - - operations = [ - ] diff --git a/users/management/commands/chsh.py b/users/management/commands/chsh.py old mode 100755 new mode 100644