Merge branch 'master' into activities-release-1

unstructuredstudio · Feb 5, 2023 · 72e1fae · 72e1fae
2 parents 1505dd9 + 18e84bb
commit 72e1fae
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 0 deletions.
diff --git a/zubhub_backend/zubhub/zubhub/urls.py b/zubhub_backend/zubhub/zubhub/urls.py
@@ -56,7 +56,10 @@
             path('api/rest-auth/password/reset/confirm/', PasswordResetConfirmView.as_view()),
             path('api/creators/', include('creators.urls')),
             path('api/projects/', include('projects.urls')),
+<<<<<<< HEAD
             path('api/activities/', include('activities.urls')),
+=======
+>>>>>>> master
             path('api/activitylog/', include('activitylog.urls')),
             path('api/upload-file/', UploadFileAPIView),
             path('api/delete-file/', DeleteFileAPIView),

diff --git a/zubhub_frontend/zubhub/package-lock.json b/zubhub_frontend/zubhub/package-lock.json