Merge branch 'master' of https://github.com/juanifioren/django-oidc-provider into v0.1.0-dev
Conflicts: example_project/.gitignore
This commit is contained in:
commit
a08dbdb7d2
11 changed files with 82 additions and 44 deletions
2
example_project/.gitignore
vendored
2
example_project/.gitignore
vendored
|
@ -1,2 +1,2 @@
|
|||
*.sqlite3
|
||||
*.pem
|
||||
*.pem
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue