FyloZ 5a36c3e491 Merge branch 'develop' into feature/12-user-info-in-jwt ... # Conflicts: # build.gradle.kts # src/main/kotlin/dev/fyloz/colorrecipesexplorer/service/RecipeService.kt # src/test/kotlin/dev/fyloz/colorrecipesexplorer/service/ConfigurationServiceTest.kt # src/test/kotlin/dev/fyloz/colorrecipesexplorer/service/MaterialServiceTest.kt # src/test/kotlin/dev/fyloz/colorrecipesexplorer/service/RecipeServiceTest.kt		2021-12-02 21:36:29 -05:00
..
main	Merge branch 'develop' into feature/12-user-info-in-jwt	2021-12-02 21:36:29 -05:00
test/kotlin/dev/fyloz/colorrecipesexplorer	Merge branch 'develop' into feature/12-user-info-in-jwt	2021-12-02 21:36:29 -05:00