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

Merge branch 'devel' into 'production'

Devel

See merge request !48
parents ead529a3 dc581ad4
No related branches found
No related tags found
3 merge requests!50Fix: Puppet Defining "data_provider": "hiera" in metadata.json is deprecated....,!49Replace tomre48 with emian13,!48Devel
Pipeline #135734 passed
......@@ -26,3 +26,7 @@
^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
^https?://www.google\.com/search\?q=site%3Acppreference.com\+.* true
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment