django/website/hid/views/item.py · 304addd65c4dca29d47252cacd442561084f78a3 · aptivate / client-projects / internewshid · GitLab

Snippets Groups Projects

9 years ago
5b5cdfe3
Merge branch 'edit_item_frontend' of github.com:aptivate/internewshid into item_submit_method · 5b5cdfe3
Martin Burchell authored 9 years ago
```
Conflicts:
	django/website/hid/tests/add_edit_item_view_tests.py
	django/website/hid/urls.py
	django/website/hid/views/item.py
```
5b5cdfe3

History
Merge branch 'edit_item_frontend' of github.com:aptivate/internewshid into item_submit_method
Martin Burchell authored 9 years ago
```
Conflicts:
	django/website/hid/tests/add_edit_item_view_tests.py
	django/website/hid/urls.py
	django/website/hid/views/item.py
```

Webarchitects | Forum | Status | SSH Fingerprints