Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

nshmp-haz
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

f3cf61c3

Commit f3cf61c3 authored 1 year ago by Powers, Peter M.

Downloads
- Plain Diff

Resolved dependency conflict

Merge branch 'main' into 'increment-lib'

# Conflicts:
#   gradle.properties

parents 94b519c4 e4cd86b2

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 21 additions, 31 deletions

.gitlab-ci.yml
Dockerfile 15 additions, 6 deletions

Dockerfile
docs/pages/Using-Docker.md 3 additions, 3 deletions

docs/pages/Using-Docker.md
gradle.properties 1 addition, 1 deletion

gradle.properties
gradle/app-version.gradle 8 additions, 5 deletions

gradle/app-version.gradle
ws.Dockerfile 16 additions, 6 deletions

ws.Dockerfile

with 64 additions and 52 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