Commit Graph

2 Commits

Author SHA1 Message Date
chriseth
691f7e6eae Fix merge conflicts. 2020-11-17 19:59:23 +01:00
Alex Beregszaszi
a3381d7260 Add settings.viaIR to standard json 2020-11-12 22:38:44 +00:00