Merge remote-tracking branch 'upstream/master' into metadata-editor

This commit is contained in:
MrTimscampi
2020-05-18 19:15:20 +02:00
117 changed files with 560 additions and 563 deletions
File diff suppressed because it is too large Load Diff