Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

docker-template-repo
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

07bd1350

Commit 07bd1350 authored 2 years ago by Griefed

Downloads
- Plain Diff

Merge branch 'main' into 'renovate-org.apache.logging.log4j-log4j-web-2.x'

# Conflicts:
#   build.gradle

parents a40a85bb 5150e55c

No related branches found

No related tags found

1 merge request!105Update dependency org.apache.logging.log4j:log4j-web to v2.17.2

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.github/workflows/test.yml 2 additions, 2 deletions

.github/workflows/test.yml
build.gradle 2 additions, 2 deletions

build.gradle
frontend/package-lock.json 21 additions, 21 deletions

frontend/package-lock.json
frontend/package.json 3 additions, 3 deletions

frontend/package.json
gradle/wrapper/gradle-wrapper.properties 1 addition, 1 deletion

gradle/wrapper/gradle-wrapper.properties

with 29 additions and 29 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Me haz all ze repositoriiiiiiiiiiiiiiiiiies