Recolle les fixations ensemble

CHANGELOG.md

@@ -120,3 +120,11 @@ Don't forget to run migrations, several settings previously in the `preferences`
 in their own Payment models.
 
 To have a closer look on how the payments works, please go to the wiki.
+
+## MR xxx: Add role models
+
+Adds the Role model.
+You need to ensure that your database character set is utf-8.
+```sql
+ALTER DATABASE re2o CHARACTER SET utf8;
+```

machines/migrations/0083_role.py → machines/migrations/0084_role.py

@@ -9,7 +9,7 @@ import re2o.mixins
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('machines', '0082_auto_20180621_1524'),
+        ('machines', '0083_remove_duplicate_rights'),
     ]
 
     operations = [

machines/migrations/0094_role_specific_role.py → machines/migrations/0085_role_specific_role.py

@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('machines', '0093_merge_20180710_0226'),
+        ('machines', '0084_role'),
     ]
 
     operations = [