cpsc471_w25_project/urls.py · main · Kian Klemencic / cpsc471-w25-project · GitLab

Apr 21, 2025
5633717e
Merge remote-tracking branch 'origin/1-create-user-home-screen' · 5633717e
Kian Klemencic authored Apr 21, 2025
```
# Conflicts:
#	cpsc471_w25_project/settings.py
#	cpsc471_w25_project/urls.py
```
5633717e
Merge remote-tracking branch 'origin/1-create-user-home-screen'
Kian Klemencic authored Apr 21, 2025
```
# Conflicts:
#	cpsc471_w25_project/settings.py
#	cpsc471_w25_project/urls.py
```