Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12009 from edx/merge-release-into-master

Browse Source 
Merge oauth release into master via intermediary branch
This commit is contained in:
Cliff Dyer
2016-04-01 06:12:16 -04:00
parent 75b8eae964 05218f954b
commit 6917eb03cf
44 changed files with 1142 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openedx/core/djangoapps/credentials/tests/test_utils.py
View File

@@ -6,7 +6,7 @@ from django.core.cache import cache
from django.test import TestCase
from nose.plugins.attrib import attr
import httpretty
from oauth2_provider.tests.factories import ClientFactory
from edx_oauth2_provider.tests.factories import ClientFactory
from provider.constants import CONFIDENTIAL
from openedx.core.djangoapps.credentials.tests.mixins import CredentialsApiConfigMixin, CredentialsDataMixin