Merge fixes

This commit is contained in:
Joel Bradshaw 2021-01-17 13:09:49 -08:00
parent a4519d55c9
commit 49893f49e1
2 changed files with 2 additions and 2 deletions

View file

@ -2,7 +2,7 @@ from django.test import TestCase, Client
from django.utils import timezone from django.utils import timezone
from datetime import datetime from datetime import datetime
from bookwyrm import view_actions as actions, models from bookwyrm import models
class ReadThrough(TestCase): class ReadThrough(TestCase):
def setUp(self): def setUp(self):

View file

@ -15,7 +15,7 @@ from .landing import About, Home, Feed, Discover
from .notifications import Notifications from .notifications import Notifications
from .outbox import Outbox from .outbox import Outbox
from .reading import edit_readthrough, create_readthrough, delete_readthrough from .reading import edit_readthrough, create_readthrough, delete_readthrough
from .reading import start_reading, finish_reading from .reading import start_reading, finish_reading, delete_progressupdate
from .password import PasswordResetRequest, PasswordReset, ChangePassword from .password import PasswordResetRequest, PasswordReset, ChangePassword
from .tag import Tag, AddTag, RemoveTag from .tag import Tag, AddTag, RemoveTag
from .search import Search from .search import Search