Commits
Marcin Rochowiak authored 5817a83e02bM
Merge remote-tracking branch 'origin/RS-141_User_Action' into RS-141_User_Action # Conflicts: # application/pom.xml # application/src/main/java/pl/psnc/eosc/rs/preprocessor/preprocessorcore/PreprocessorCoreApplication.java # application/src/main/resources/application.properties # application/src/test/java/pl/psnc/eosc/rs/preprocessor/preprocessorcore/ExecuteViaTests.java # application/src/test/java/pl/psnc/eosc/rs/preprocessor/preprocessorcore/user/action/UserActionControllerTest.java # application/src/test/java/pl/psnc/eosc/rs/preprocessor/preprocessorcore/user/action/UserActionServiceTest.java
Showing diff to718496e47c9