yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into switch-edition

Browse Source
This commit is contained in:
Mouse Reeve
2020-12-16 09:21:02 -08:00
parent b2c1bc1481 948e938040
commit 5dbacb3524
15 changed files with 878 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bookwyrm/migrations/0024_auto_20201216_1719.py → bookwyrm/migrations/0023_auto_20201214_0511.py
View File

@ -1,4 +1,4 @@
# Generated by Django 3.0.7 on 2020-12-16 17:19
# Generated by Django 3.0.7 on 2020-12-14 05:11
import bookwyrm.models.fields
from django.db import migrations
@ -7,7 +7,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('bookwyrm', '0023_merge_20201216_0112'),
('bookwyrm', '0022_auto_20201212_1744'),
]
operations = [

14
bookwyrm/migrations/0024_merge_20201216_1721.py Normal file
View File

@ -0,0 +1,14 @@
# Generated by Django 3.0.7 on 2020-12-16 17:21
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('bookwyrm', '0023_auto_20201214_0511'),
('bookwyrm', '0023_merge_20201216_0112'),
]
operations = [
]