Fix merge conflicts in https://github.com/plausible/wordpress/pull/300 - #307

Fix merge conflicts in https://github.com/plausible/wordpress/pull/300#307

Dan0sz wants to merge 13 commits into

developplausible/wordpress:developfrom

a8cteam51-feature/harden-proxy-apiplausible/wordpress:a8cteam51-feature/harden-proxy-apiCopy head branch name to clipboard