-
# Conflicts: # docker/docker-compose.yml
-
merge persistence to development See merge request !1
-
# 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
