Fixed merge conflicts

This commit is contained in:
Alejandro Celaya
2022-02-05 16:48:55 +01:00
26 changed files with 641 additions and 75 deletions

View File

@@ -26,4 +26,6 @@ export const supportsForwardQuery = serverMatchesVersions({ minVersion: '2.9.0'
export const supportsDefaultDomainRedirectsEdition = serverMatchesVersions({ minVersion: '2.10.0' });
export const supportsAllTagsFiltering = serverMatchesVersions({ minVersion: '3.0.0' });
export const supportsNonOrphanVisits = serverMatchesVersions({ minVersion: '3.0.0' });
export const supportsAllTagsFiltering = supportsNonOrphanVisits;