diff options
| author |  kwzrd <[email protected]> | 2020-03-15 19:57:11 +0100 |
|---|---|---|
| committer | kwzrd <[email protected]> | 2020-03-15 19:57:11 +0100 |
| commit | b9808a82c41c81d0501a713f854e93a0e5f2054a (patch) | |
| tree | 1175115cce8e36d4ab4a3c28b4c67806da928dd9 /bot/__main__.py | |
| parent | Deseasonify: move the branding module from seasons to bot directory (diff) | |
| parent | Merge pull request #371 from ks129/help (diff) | |
Merge branch 'master' into seasonal-purge
This merges the newly added help cog.
Resolve slight conflict in the __main__ module caused by the the master
branch still assuming the presence of the legacy season manager cog.
Diffstat (limited to 'bot/__main__.py')
| -rw-r--r-- | bot/__main__.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bot/__main__.py b/bot/__main__.py index 5ac6b33e..780c8c4d 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -12,4 +12,7 @@ bot.add_check(in_channel_check(*WHITELISTED_CHANNELS, bypass_roles=STAFF_ROLES)) for ext in get_extensions(): bot.load_extension(ext) +bot.load_extension("bot.branding") +bot.load_extension("bot.help") + bot.run(Client.token) |