Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SOIL Backend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

b20a2949

Commit b20a2949 authored 10 months ago by Matthias Stefan Bodenbenner

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/origin/develop-visual-gen' into develop

# Conflicts:
#	resources/soil.jar

parents 14c05ed3 7cf0d1e1

No related branches found

No related tags found

Loading

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

resources/soil.jar 0 additions, 0 deletions

resources/soil.jar
src/main.py 16 additions, 9 deletions

src/main.py
src/translate.py 30 additions, 4 deletions

src/translate.py

with 46 additions and 13 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