diff options
| author | gesang <gesang@itinerariummentis.org> | 2024-07-15 08:45:19 +0000 |
|---|---|---|
| committer | gesang <gesang@itinerariummentis.org> | 2024-07-15 08:45:19 +0000 |
| commit | cd8115bb1a79fcbb8853e3c5130d090b42fa3941 (patch) | |
| tree | d846f74ea8e5b6490b3c069900c496b032000b13 /data | |
| parent | edfa4b96dcdf950eb9983a3886b5a0a2bf0674b1 (diff) | |
| parent | 029af216d48c56ad310f4ba82ac0ed2fb57d5e32 (diff) | |
Merge branch 'master' of https://git.lolcat.ca/lolcat/4get
Diffstat (limited to 'data')
| -rw-r--r-- | data/config.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/data/config.php b/data/config.php index ae642bb..888b4b7 100644 --- a/data/config.php +++ b/data/config.php @@ -122,7 +122,11 @@ class config{ const PROXY_BRAVE = false; const PROXY_FB = false; // facebook const PROXY_GOOGLE = false; +<<<<<<< HEAD const PROXY_GOOGLEALT = false;//ipv6 version of google +======= + const PROXY_STARTPAGE = false; +>>>>>>> 029af216d48c56ad310f4ba82ac0ed2fb57d5e32 const PROXY_QWANT = false; const PROXY_MARGINALIA = false; const PROXY_MOJEEK = false; |