Skip to content
Permalink
Branch: master
Commits on Nov 3, 2019
  1. Merge pull request #278 from python-discord/active-infractions-valida…

    SebastiaanZ committed Nov 3, 2019
    …tion
    
    Validation for active infractions
  2. Resolve migration merge conflicts

    SebastiaanZ committed Nov 3, 2019
    Since other pull requests were merged that also included migrations
    for the API app, this PR needed to be updated to avoid conflicts in
    the migration history. In addition, the test files contained names of
    specific migration files that needed to be updated to the correct
    names after the merge resolution.
You can’t perform that action at this time.