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 /LICENSE | |
| 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 'LICENSE')
| -rw-r--r-- | LICENSE | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -2,40 +2,40 @@ Files: * Copyright: 2012-2013, Sebastian Reichel <sre@ring0.de> License: ISC -Files: templates/js/sorttable.js +Files: data/templates/js/sorttable.js Copyright: 2007, Stuart Langridge <sil@kryogenix.org> License: Expat -Files: templates/js/jquery.js +Files: data/templates/js/jquery.js Copyright: 2012, jQuery Foundation and contributors License: Expat -Files: templates/js/jquery.mousewheel.js +Files: data/templates/js/jquery.mousewheel.js Copyright: 2011, Brandon Aaron (http://brandonaaron.net) License: Expat -Files: templates/js/jquery.flot.js - templates/js/jquery.flot.navigate.js - templates/js/jquery.flot.selection.js +Files: data/templates/js/jquery.flot.js + data/templates/js/jquery.flot.navigate.js + data/templates/js/jquery.flot.selection.js Copyright: 2007-2012, Ole Laursen 2007-2012, IOLA 2008, Three Dub Media (http://threedubmedia.com) License: Expat -Files: templates/js/jquery.flot.pie.js +Files: data/templates/js/jquery.flot.pie.js Copyright: 2009, Brian Medendorp 2009, btburnett3 2009, Anthony Aragues 2009, Xavi Ivars License: Expat -Files: templates/css/bootstrap.css - templates/js/bootstrap.js +Files: data/templates/css/bootstrap.css + data/templates/js/bootstrap.js Copyright: Bootstrap License: Apache-2.0 -Files: templates/img/glyphicons-halflings.png - templates/img/glyphicons-halflings-white.png +Files: data/templates/img/glyphicons-halflings.png + data/templates/img/glyphicons-halflings-white.png Copyright: Glyphicons License: CC-BY-3.0 |