Make it possible to use CanonicalSlugDetailMixin with custom url kwargs
Merge branch 'master' into pr/98
changelog
fix merge conflict.
Merge pull request #123 from brack3t/fix/custom_url_kwargs

Fix/custom url kwargs