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
No related branches found
No related tags found
2 merge requests!50Fix: Puppet Defining "data_provider": "hiera" in metadata.json is deprecated....,!48Devel
Pipeline #135733 passed
......@@ -25,6 +25,7 @@
^https?://duckduckgo\.com/.*\.css true
^https?://duckduckgo\.com/.*\.js true
^https?://duckduckgo\.com/.*\.js\?.=.* true
^https?://duckduckgo\.com/50x-tq.html\?tq=.* true
// cppreference google search
^https?://www.google\.com/ true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment