Ignacio a4d5f89536 Merge branch 'v0.2.x' of https://github.com/juanifioren/django-oidc-provider into v0.3.x ... Conflicts: oidc_provider/lib/utils/common.py oidc_provider/lib/utils/token.py		2016-02-25 10:10:07 -03:00
..
claims.rst	Modify docs.	2016-02-12 16:22:47 -03:00
clients.rst	Modify docs.	2016-02-12 16:22:47 -03:00
contribute.rst	Modify docs.	2016-02-12 16:22:47 -03:00
installation.rst	Modify docs.	2016-02-12 16:22:47 -03:00
oauth2.rst	Add OAuth2 documentation.	2016-02-18 16:24:31 -03:00
serverkeys.rst	Modify docs.	2016-02-12 16:22:47 -03:00
settings.rst	Fixed type in return	2016-02-18 13:17:04 +00:00
templates.rst	Modify docs.	2016-02-12 16:22:47 -03:00