Merge branch 'master' into hitag

* master:
  style
This commit is contained in:
Philippe Teuwen 2020-01-15 19:25:39 +01:00
commit 78a6aa389b
6 changed files with 19 additions and 19 deletions