Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
hpanther
2020-10-31 23:17:35 +01:00
69 changed files with 151 additions and 135 deletions

View File

@@ -1,6 +1,6 @@
/*
* EMS-ESP - https://github.com/proddy/EMS-ESP
* Copyright 2019 Paul Derbyshire
* Copyright 2020 Paul Derbyshire
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by