diff options
| author |  sco1 <[email protected]> | 2019-03-09 12:18:47 -0500 |
|---|---|---|
| committer | sco1 <[email protected]> | 2019-03-09 12:18:47 -0500 |
| commit | 38b06d8a2fdf3fdc9198836013e10b1e640175e1 (patch) | |
| tree | 1d90f3018f539d8f1bb88bff09f97429f307e108 /bot/__main__.py | |
| parent | Merge branch 'master' into dpy-cog-changes (diff) | |
Fix d.py version pinning & relock
Merge conflict incorrectly resolved
Diffstat (limited to 'bot/__main__.py')
0 files changed, 0 insertions, 0 deletions