Merge branch 'master' into bugfix/div-feilrettinger

navikt · Dec 13, 2023 · 70d8809 · 70d8809
2 parents 73a3abd + 42a7bae
commit 70d8809
Show file tree

Hide file tree

Showing 300 changed files with 386 additions and 11,194 deletions.
diff --git a/.github/workflows/app.arbeidsforhold-export-api.yml b/.github/workflows/app.arbeidsforhold-export-api.yml
diff --git a/.github/workflows/app.testnorge-tp.yml b/.github/workflows/app.testnorge-tp.yml
diff --git a/.github/workflows/proxy.statisk-data-forvalter-proxy.yml b/.github/workflows/proxy.statisk-data-forvalter-proxy.yml
diff --git a/...nav/testnav/apps/apptilganganalyseservice/AppTilgangAnalyseServiceApplicationStarter.java b/...nav/testnav/apps/apptilganganalyseservice/AppTilgangAnalyseServiceApplicationStarter.java
@@ -18,4 +18,4 @@ public class AppTilgangAnalyseServiceApplicationStarter {
     public static void main(String[] args) {
         SpringApplication.run(AppTilgangAnalyseServiceApplicationStarter.class, args);
     }
-}
+}
diff --git a/apps/arbeidsforhold-export-api/Dockerfile b/apps/arbeidsforhold-export-api/Dockerfile
diff --git a/apps/arbeidsforhold-export-api/README.md b/apps/arbeidsforhold-export-api/README.md
diff --git a/apps/arbeidsforhold-export-api/build.gradle b/apps/arbeidsforhold-export-api/build.gradle
diff --git a/apps/arbeidsforhold-export-api/config.yml b/apps/arbeidsforhold-export-api/config.yml
diff --git a/apps/arbeidsforhold-export-api/gradle/wrapper/gradle-wrapper.jar b/apps/arbeidsforhold-export-api/gradle/wrapper/gradle-wrapper.jar
diff --git a/apps/arbeidsforhold-export-api/gradle/wrapper/gradle-wrapper.properties b/apps/arbeidsforhold-export-api/gradle/wrapper/gradle-wrapper.properties
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,4 +18,4 @@ public class AppTilgangAnalyseServiceApplicationStarter { @@
         public static void main(String[] args) {
             SpringApplication.run(AppTilgangAnalyseServiceApplicationStarter.class, args);
         }
-    }
+    }