Merge main into merge/upstream-v0.16.24
The schema, which both sides changed, merged as JSON with no conflicts. The personal-data catalog (#83) gains upstream's new x:DnsServerPowerDns: nothing personal but its API key, like the other DNS providers.
This commit is contained in:
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@@ -1 +1 @@
|
||||
6SH8D-bnOr8ynvSjjkUDkpWWy-QxJQdfZc3KaDlE-hk
|
||||
ZjiCQWnwHbujcF7hNolPZQa-VtrNTNfc_HbSuZZ_TiY
|
||||
Reference in New Issue
Block a user