aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorGravatar SebastiaanZ <[email protected]>2019-02-22 14:12:51 +0100
committerGravatar SebastiaanZ <[email protected]>2019-02-22 14:12:51 +0100
commitd7e7d62ca3605c7271f76a942280985cd6efd80b (patch)
tree61a408a95f1e6c6a58952731456f59e2b5152da5 /README.md
parentMerge branch 'master' into bb-improvements (diff)
parentMerge pull request #313 from python-discord/Hemlock.Users_and_Roles_adjustment (diff)
Resolving merge conflicts with Hemlock's STAFF_ROLES changes
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions