Skip to content

Commit

Permalink
Merge branch 'develop' into feature/programming-exercises/bash-template
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIProgrammingLanguageFeatureService.java
  • Loading branch information
magaupp committed Jan 9, 2025
2 parents 1446b6a + 599c92e commit b5486c8
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit b5486c8

Please sign in to comment.