edu / BeuthBot_WS17 · Commits

Commit 5de3209ecf1b2363633e6a01000d83f67a3e0115

Authored by mfcb
2 parents 0f38e630 46466384
build: skipped

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

# Conflicts:
#	services/MainBot/src/main/java/de/bht/beuthbot/scheduler/SchedulerBean.java
#	services/MainBot/src/main/java/de/bht/beuthbot/scheduler/model/Reminder.java
#	services/MainBot/src/main/resources/de/bht/beuthbot/drools/Canteen.drl
.gitlab-ci.yml not found in this commit
Latest builds
 
Status Build ID Ref Stage Name Duration Finished at