diff options
| author | Holger Cremer <HolgerCremer@gmail.com> | 2018-08-27 19:38:11 +0200 |
|---|---|---|
| committer | Holger Cremer <HolgerCremer@gmail.com> | 2018-08-27 19:38:11 +0200 |
| commit | 8f2ba2050ee78d0e4a47f1277c6bc4422d06170c (patch) | |
| tree | c008d2878905e03df7a8bf8bd3330762cc2d8f43 /templates/index.html | |
| parent | bb55e121576a5b5d225bfc68c5062f386cc32db9 (diff) | |
| parent | 3fc3ea6c6df237dbdf48d14703118b747bf5d647 (diff) | |
| download | serial-barcode-scanner-8f2ba2050ee78d0e4a47f1277c6bc4422d06170c.tar.bz2 | |
Merge branch 'master' into better_inventory
Conflicts:
README
data/templates/products/entry.html
docker/Dockerfile
docker/init.sh
src/database/database.vala
src/database/db-interface.vala
src/pdf-stock/Makefile
src/pdf-stock/pdf-stock-interface.vala
src/pdf-stock/pdf-stock.vala
src/web/Makefile
src/web/main.vala
templates/menu.html
templates/products/index.html
Diffstat (limited to 'templates/index.html')
| -rw-r--r-- | templates/index.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/templates/index.html b/templates/index.html deleted file mode 100644 index c7782bd..0000000 --- a/templates/index.html +++ /dev/null @@ -1 +0,0 @@ -<p>Welcome to the new KtT Shop System.</p> |