Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/#39' into #39
Browse files Browse the repository at this point in the history 
# Conflicts:
#	boot/src/main/resources/boot.properties
#	user-module/src/main/java/io/edpn/backend/user/configuration/PropertyConfig.java
  • Loading branch information
Pieter Van Eeckhout committed Jun 27, 2023
2 parents e336ce2 + 8ae145b commit 53239ab
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 53239ab

Please sign in to comment.