1
0
Fork 0

Merge branch 'main' into switch-edition

This commit is contained in:
Mouse Reeve 2020-12-13 21:10:37 -08:00
commit b36eaef172
113 changed files with 3354 additions and 1578 deletions

View file

@ -53,7 +53,8 @@ urlpatterns = [
path('', views.home),
re_path(r'^(?P<tab>home|local|federated)/?$', views.home_tab),
re_path(r'^notifications/?', views.notifications_page),
re_path(r'^notifications/?$', views.notifications_page),
re_path(r'^direct-messages/?$', views.direct_messages_page),
re_path(r'^import/?$', views.import_page),
re_path(r'^import-status/(\d+)/?$', views.import_status),
re_path(r'^user-edit/?$', views.edit_profile_page),