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

Merge branch 'develop' into add_item_frontent 

Conflicts:
	django/website/hid/templates/hid/add_edit_item.html
	django/website/hid/tests/add_edit_item_view_tests.py
	django/website/hid/views/item.py
parents 31072e8d a2c2cef2
No related branches found
No related tags found
1 merge request!40Add item frontend
Hide whitespace changes
Inline Side-by-side
Showing
with 404 additions and 123 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Webarchitects | Forum | Status | SSH Fingerprints