Skip to content

Commit

Permalink
Merge branch 'master' into Upgrade_to_Grails_4
Browse files Browse the repository at this point in the history 
# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
  • Loading branch information
Jack Frosch committed Mar 18, 2020
2 parents 46b5e2f + dfa379b commit 3c63ed9
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 3c63ed9

Please sign in to comment.