Skip to content
Snippets Groups Projects
Commit 5b5cdfe3 authored by Martin Burchell's avatar Martin Burchell
Browse files

Merge branch 'edit_item_frontend' of github.com:aptivate/internewshid into item_submit_method 

Conflicts:
	django/website/hid/tests/add_edit_item_view_tests.py
	django/website/hid/urls.py
	django/website/hid/views/item.py
parents 346243ec 62119a82
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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