diff options
| author | 2018-09-13 10:38:19 -0500 | |
|---|---|---|
| committer | 2018-09-13 10:38:19 -0500 | |
| commit | 3db6f3f6cd895d7a2f03283afd0e596c7fed5628 (patch) | |
| tree | b0aaaf45b7e956aa3d7d68afe6543670b17f1214 /scripts | |
| parent | - Changed variable name from bad_ticks to has_bad_ticks (diff) | |
| parent | - Changed function name from bad_ticks to has_bad_ticks (diff) | |
Merge remote-tracking branch 'origin/hemlock-format_block_timeout' into hemlock-format_block_timeout
# Conflicts:
# bot/cogs/bot.py
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions