Commit 4084b177ca8f787901ca13925e78e258c2e563ea

Authored by mfcb
2 parents fae0497c ada5a8e7

Merge remote-tracking branch 'origin/Scheduler' into Scheduler

# Conflicts:
#	docker/wildfly/volumes/conf/beuthbot.properties
#	services/Common/src/main/java/de/bht/beuthbot/model/Intent.java
#	services/MainBot/src/main/java/de/bht/beuthbot/scheduler/SchedulerBean.java
#	settings.gradle
.gitlab-ci.yml not found in this commit
Latest builds
 
Status Build ID Ref Stage Name Duration Finished at