Merge branch 'development' into cleanup/remove_legacy_detect

Conflicts:
	automated install/basic-install.sh
pull/1001/head
DL6ER 8 years ago
commit 9432d3035a
No known key found for this signature in database
GPG Key ID: BB8EC0BC77973A30

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save