Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

LakeDropsDrupalDev
- Activity
- Members
- Labels
- Service Desk
- Model experiments

Snippets Groups Projects

ddbee49a

Commit ddbee49a authored 6 years ago by jurgenhaas

Downloads
- Plain Diff

Merge branch 'master' into develop

# Conflicts:
#	l3d

parents d509c308 322be173

No related branches found

No related tags found

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 16 additions, 6 deletions

.gitlab-ci.yml
.start 26 additions, 17 deletions

.start
Dockerfile 1 addition, 1 deletion

Dockerfile
README.md 8 additions, 9 deletions

README.md
l3d 0 additions, 157 deletions

l3d
run/Dockerfile 17 additions, 0 deletions

run/Dockerfile
run/scripts/help 10 additions, 0 deletions

run/scripts/help
run/scripts/run 13 additions, 0 deletions

run/scripts/run
run/scripts/selfupdate 22 additions, 0 deletions

run/scripts/selfupdate
run/scripts/start 54 additions, 0 deletions

run/scripts/start
run/scripts/update 22 additions, 0 deletions

run/scripts/update
run/scripts/version 3 additions, 0 deletions

run/scripts/version
setup/Dockerfile 16 additions, 0 deletions

setup/Dockerfile
setup/scripts/l3d 21 additions, 0 deletions

setup/scripts/l3d
setup/scripts/setup 8 additions, 0 deletions

setup/scripts/setup

with 237 additions and 190 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