Merge branch 'development' into cleanup/remove_legacy_detect

Browse Source

Conflicts:
	automated install/basic-install.sh

...

This commit is contained in:

DL6ER 2016-12-21 12:01:58 +01:00

parent 8117ec8e20 d42caa8672

commit 9432d3035a

No known key found for this signature in database

GPG Key ID: BB8EC0BC77973A30

1 changed files with 742 additions and 746 deletions

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

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

1488

automated install/basic-install.sh

File diff suppressed because it is too large Load Diff