Skip to content
Snippets Groups Projects
Commit 53ad249f authored by Alice Heaton's avatar Alice Heaton :speech_balloon:
Browse files

Merge remote-tracking branch 'origin/theming' into dashboard_theme_merge

Conflicts:
	django/website/hid/templates/hid/dashboard.html
parents 5372e4fe 720b0ccd
No related branches found
No related tags found
No related merge requests found
Showing
with 1463 additions and 34 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 to comment