Master #55

Merged
Rich merged 7 commits from master into dev 2020-02-28 18:53:30 +00:00
7 Commits
Author SHA1 Message Date
rich bc10fac9f0 Merge branch 'master' of http://gitlab.rickelobe.com/Bots/r0b3BOT 2020-02-28 13:52:15 -05:00
rich 81deee6692 corrected missing var 2020-02-28 13:52:04 -05:00
rich b44075c37d Merge branch 'dev' into 'master'
Dev

See merge request Bots/r0b3BOT!44
2020-02-28 13:45:10 -05:00
rich 99a6d362d5 Added aww cmd to play Awww_Bitch.mp3 2020-02-28 13:43:17 -05:00
rich e4c69be8f2 Merge branch 'dev' into 'master'
Feature Request #4 completed, requesting merge into master

See merge request Bots/r0b3BOT!43
2019-12-06 08:38:21 -05:00
rich 1fe66ee2da Feature Request #4 completed, requesting merge into master 2019-12-06 08:38:21 -05:00
rich bb265b750e Merge branch 'dev' into 'master'
only deploy when merged w/ dev and master branches

See merge request Bots/r0b3BOT!38
2019-12-05 23:08:38 -05:00