diff options
| author | Sebastian Reichel <sre@ring0.de> | 2015-05-10 01:06:46 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@ring0.de> | 2015-05-10 01:06:46 +0200 |
| commit | 1f448ff2a0df12afbac6c3a30a23829440495cd4 (patch) | |
| tree | dbf8e14db6ec25af07c3da1a5466531290af7b61 /inventar/templates/base.html | |
| parent | 1c3bd651e0477d133e5770930eb8c7bb08c4aff5 (diff) | |
| parent | 1dc5ee4fdeb29dc6e058bda5a7c259968b763860 (diff) | |
| download | ktt-inventory-system-1f448ff2a0df12afbac6c3a30a23829440495cd4.tar.bz2 | |
merge conflict
Diffstat (limited to 'inventar/templates/base.html')
| -rw-r--r-- | inventar/templates/base.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/inventar/templates/base.html b/inventar/templates/base.html index a97ed7e..8304687 100644 --- a/inventar/templates/base.html +++ b/inventar/templates/base.html @@ -16,6 +16,7 @@ <li><a href="{% url "home" %}"><img src="/static/home.svg" width="24" height="24" /> {% trans "Home" %}</a></li> <li><a href="{% url "admin:index" %}"><img src="/static/admin.svg" width="24" height="24" /> {% trans "Admin Area" %}</a></li> <li><a href="{% url "stats" %}"><img src="/static/stats.svg" width="24" height="24" /> {% trans "Statistics" %}</a></li> + <li><a href="{% url "upload" %}"><img src="/static/stats.svg" width="24" height="24" /> {% trans "Upload" %}</a></li> <li><br></li> <li>{% trans "Search Item" %}: <ul> |