django/website/hid/assets.py · 6171e8291cb93b7ca5d10676f40856eeb09dcfdc · aptivate / client-projects / internewshid · GitLab

Snippets Groups Projects

9 years ago
31af88fa
Merge remote-tracking branch 'origin/develop' into view-single-item · 31af88fa
Jay Alvarez authored 9 years ago
```
Conflicts:
	django/website/hid/assets.py
	django/website/hid/views.py
	django/website/media/less/view-edit.less
```
31af88fa

History
Merge remote-tracking branch 'origin/develop' into view-single-item
Jay Alvarez authored 9 years ago
```
Conflicts:
	django/website/hid/assets.py
	django/website/hid/views.py
	django/website/media/less/view-edit.less
```

Webarchitects | Forum | Status | SSH Fingerprints