Merge branch 'devel' into new/FTL-integration

Browse Source

Conflicts:
	api.php

...

This commit is contained in:

DL6ER

2017-02-28 13:49:34 +01:00

parent aacc215394 3b5578321a

commit 7a73053bfd

15 changed files with 1784 additions and 66 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

scripts/vendor/qrcode.php

Vendored

+1543

File diff suppressed because it is too large Load Diff