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

Merge branch 'devel' into 'production'

Devel

See merge request liu-puppet-modules/aes!12
parents dc382162 9ddae20d
Branches
No related tags found
2 merge requests!30Merge branch 'cherry-pick-b940cfc1' into 'test',!12Devel
Pipeline #54983 passed
...@@ -19,10 +19,13 @@ ...@@ -19,10 +19,13 @@
^https?://raw\.githubusercontent\.com/STIMALiU/KursRprgm/master/Labs/Tests/.* true ^https?://raw\.githubusercontent\.com/STIMALiU/KursRprgm/master/Labs/Tests/.* true
// 732GA98 // 732GA98
^https?://plot\.ly/r/reference.* true ^https?://plot\.ly/r/reference.* true
^https?://ggplot2\.tidyverse\.org/.* true ^https?://plotly\.com/r/reference/.* true
^https?://plotly\.com/all_static/.* true
^https?://ggplot2\.tidyverse\.org/.* true
^https?://shiny\.rstudio\.com/reference/shiny/.* true ^https?://shiny\.rstudio\.com/reference/shiny/.* true
^https?://www\.jasondavies\.com/wordtree/.* true ^https?://www\.jasondavies\.com/wordtree/.* true
^https?://www\.ida\.liu\.se/~732A98/.* true
// For plot.ly // For plot.ly
^https?://ajax\.googleapis\.com/ajax/libs/.*\.js true ^https?://ajax\.googleapis\.com/ajax/libs/.*\.js true
......
// google translate // google translate
^https?://translate\.google\.se/.* true ^https?://translate\.google\.se/.* true
^https?://consent\.google\.se/.* true ^https?://translate\.google\.com/.* true
^https?://ssl\.gstatic\.com/.* true ^https?://ssl\.gstatic\.com/.* true
...@@ -10,3 +10,6 @@ ...@@ -10,3 +10,6 @@
^https?://accounts\.google\.com/.* false ^https?://accounts\.google\.com/.* false
^https?://fonts\.googleapis\.com/.* true ^https?://fonts\.googleapis\.com/.* true
^https?://consent\.google\.se/m\?continue=.* true
^https?://consent\.youtube\.com/s\?continue=.* true
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment