Skip to content
Snippets Groups Projects
Commit dc581ad4 authored by Klas Arvidsson's avatar Klas Arvidsson
Browse files

Production merge and conflict resolution

parents b9a74a57 ead529a3
Branches
Tags
2 merge requests!50Fix: Puppet Defining "data_provider": "hiera" in metadata.json is deprecated....,!48Devel
Pipeline #135733 passed
Stage: puppet
Hide whitespace changes
Inline Side-by-side
files/squid/helpers/rules.d/cplusplus.rules
+ 1
− 0
View file @ dc581ad4
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
^https?://duckduckgo\.com/.*\.css true ^https?://duckduckgo\.com/.*\.css true
^https?://duckduckgo\.com/.*\.js true ^https?://duckduckgo\.com/.*\.js true
^https?://duckduckgo\.com/.*\.js\?.=.* true ^https?://duckduckgo\.com/.*\.js\?.=.* true
^https?://duckduckgo\.com/50x-tq.html\?tq=.* true
// cppreference google search // cppreference google search
^https?://www.google\.com/ true ^https?://www.google\.com/ true
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment