diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 722096e80ffbfe0c333d00d0541e038d2f6311d0..94a25f7f4cb416c083d265558da75d457237d671 100755 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ <project version="4"> <component name="VcsDirectoryMappings"> <mapping directory="$PROJECT_DIR$" vcs="Git" /> - <mapping directory="$PROJECT_DIR$/schoolapps/static/materialize" vcs="Git" /> </component> </project> \ No newline at end of file diff --git a/schoolapps/aub/migrations/0012_auto_20190411_0951.py b/schoolapps/aub/migrations/0012_auto_20190411_0951.py new file mode 100644 index 0000000000000000000000000000000000000000..4600ff37b2bf02b39616a43cea580e7a32df7a60 --- /dev/null +++ b/schoolapps/aub/migrations/0012_auto_20190411_0951.py @@ -0,0 +1,27 @@ +# Generated by Django 2.1.5 on 2019-04-11 07:51 + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ('aub', '0011_merge_20190318_2004'), + ] + + operations = [ + migrations.AlterField( + model_name='aub', + name='created_by', + field=models.ForeignKey(default=3, on_delete=models.SET(3), related_name='aubs', + to=settings.AUTH_USER_MODEL), + ), + migrations.AlterField( + model_name='aub', + name='status', + field=models.IntegerField(default=0), + ), + migrations.DeleteModel( + name='Status', + ), + ]