Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/s04e03' into s04e03_upgrade_to_g…
Browse files Browse the repository at this point in the history
…radle_8

# Conflicts:
#	diagram.svg
#	gradle/libs.versions.toml
#	settings.gradle
#	versions.properties
  • Loading branch information
Arc-E-Tect committed Oct 23, 2024
2 parents 9a5de7e + 509c95d commit 1f9d19f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion diagram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1f9d19f

Please sign in to comment.