Merge with latest 2.3

2020-10-07 21:01:45 +02:00
parent fd9ae06519 c07be1eb9b
commit 42a3198568
376 changed files with 10566 additions and 8633 deletions
@@ -158,9 +158,9 @@ const char * const unitsFilenames[] = {
  "ml",
  "founce",
  "mlpm",
-  "spare1",
-  "spare2",
-  "spare3",
+  "hertz",
+  "ms",
+  "us",
  "spare4",
  "spare5",
  "spare6",