Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ServerPackCreator
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

5aa675e8

Verified Commit 5aa675e8 authored 2 years ago by Griefed

Downloads
- Plain Diff

Merge branch 'dependabot' of https://github.com/Griefed/ServerPackCreator into develop

# Conflicts:
#	build.gradle
#	frontend/package-lock.json
#	frontend/package.json

parents 715070cb b36d8760

No related branches found

No related tags found

1 merge request!263Merge develop into main

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

backend/main/java/de/griefed/serverpackcreator/ServerPackCreator.java 1 addition, 44 deletions

.../java/de/griefed/serverpackcreator/ServerPackCreator.java
backend/main/java/de/griefed/serverpackcreator/ServerPackHandler.java 5 additions, 5 deletions

.../java/de/griefed/serverpackcreator/ServerPackHandler.java
frontend/package-lock.json 21 additions, 21 deletions

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

frontend/package.json
frontend/src/layouts/MainLayout.vue 1 addition, 2 deletions

frontend/src/layouts/MainLayout.vue

with 31 additions and 75 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