Merge pull request #2036 from normanjaeckel/UpdateMigrations

Updated migrations.
This commit is contained in:
Emanuel Schütze 2016-03-06 18:13:42 +01:00
commit 2f168e2945

View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.2 on 2016-03-02 01:22
# Generated by Django 1.9.2 on 2016-03-06 14:33
from __future__ import unicode_literals
from django.db import migrations, models
@ -54,12 +54,12 @@ class Migration(migrations.Migration):
verbose_name='user permissions')),
],
options={
'ordering': ('last_name', 'first_name', 'username'),
'default_permissions': (),
'permissions': (
('can_see_name', 'Can see names of users'),
('can_see_extra_data', 'Can see extra data of users'),
('can_see_extra_data', 'Can see extra data of users (e.g. present and comment)'),
('can_manage', 'Can manage users')),
'default_permissions': (),
'ordering': ('last_name', 'first_name', 'username'),
},
bases=(openslides.utils.models.RESTModelMixin, models.Model),
),