Commit ed91cdcf authored by Levy--Falk Hugo's avatar Levy--Falk Hugo

Recolle les fixations ensemble

parent 5dc59035
...@@ -120,3 +120,11 @@ Don't forget to run migrations, several settings previously in the `preferences` ...@@ -120,3 +120,11 @@ Don't forget to run migrations, several settings previously in the `preferences`
in their own Payment models. in their own Payment models.
To have a closer look on how the payments works, please go to the wiki. 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;
```
...@@ -9,7 +9,7 @@ import re2o.mixins ...@@ -9,7 +9,7 @@ import re2o.mixins
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('machines', '0082_auto_20180621_1524'), ('machines', '0083_remove_duplicate_rights'),
] ]
operations = [ operations = [
......
...@@ -8,7 +8,7 @@ from django.db import migrations, models ...@@ -8,7 +8,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('machines', '0093_merge_20180710_0226'), ('machines', '0084_role'),
] ]
operations = [ operations = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment