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/item.html | |
| parent | 1c3bd651e0477d133e5770930eb8c7bb08c4aff5 (diff) | |
| parent | 1dc5ee4fdeb29dc6e058bda5a7c259968b763860 (diff) | |
| download | ktt-inventory-system-1f448ff2a0df12afbac6c3a30a23829440495cd4.tar.bz2 | |
merge conflict
Diffstat (limited to 'inventar/templates/item.html')
0 files changed, 0 insertions, 0 deletions