Skip to content
Snippets Groups Projects
Commit 91a37b16 authored by b2-wilton's avatar b2-wilton
Browse files

Merge branch 'main' into 'brodybranch' 

# Conflicts:
#   myproject/myapp/templates/_base.html
#   myproject/myapp/urls.py
parents 5a4129cf 17ecba3e
Branches
No related tags found
4 merge requests!12dashboard waiting for user logic final and data for tables. changed index....,!11dashboard waiting for user logic final and data for tables. changed index....,!9Add routes and urls for pricing page. Update navbar links for pricing page and...,!8Add routes and urls for pricing page. Update navbar links for pricing page and...
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment