Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

desd
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

10b6f8a6

Commit 10b6f8a6 authored 1 year ago by James Smith

Downloads
- Plain Diff

Merge branch 'main' into 'James'

Merging main into my branch

See merge request !2

parents eb1810f5 ca163bb8

Branches

No related tags found

1 merge request!2Merging main into my branch

Changes 29

Expand all Show whitespace changes

Inline Side-by-side

Showing

myproject/myapp/templates/404.html 41 additions, 0 deletions

myproject/myapp/templates/404.html
myproject/myapp/templates/500.html 40 additions, 0 deletions

myproject/myapp/templates/500.html
myproject/myapp/templates/_base.html 10 additions, 17 deletions

myproject/myapp/templates/_base.html
myproject/myapp/templates/index.html 87 additions, 38 deletions

myproject/myapp/templates/index.html
myproject/myapp/templates/maintenance.html 44 additions, 0 deletions

myproject/myapp/templates/maintenance.html
myproject/myapp/templates/user_page.html 604 additions, 0 deletions

myproject/myapp/templates/user_page.html
myproject/myapp/urls.py 9 additions, 0 deletions

myproject/myapp/urls.py
myproject/myapp/views.py 17 additions, 0 deletions

myproject/myapp/views.py
myproject/myproject/settings.py 1 addition, 1 deletion

myproject/myproject/settings.py

with 853 additions and 56 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment