Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	core/src/main/kotlin/sh/illumi/kraft/service/ServiceMetadata.kt
  • Loading branch information
@LizAinslie
LizAinslie committed Nov 8, 2024
2 parents 3a9e8c1 + 4af256b commit 9cd6050
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 9cd6050

Please sign in to comment.