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

Merge pull request #1823 from edx/db/mitxmako-edxmako

Browse Source 
mitxmako => edxmako
This commit is contained in:
David Baumgold
2013-12-03 11:36:50 -08:00
parent e872c4f276 8eff442752
commit 69899e24df
81 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/djangoapps/courseware/tests/__init__.py
View File

@@ -11,7 +11,7 @@ from django.test.utils import override_settings
from django.core.urlresolvers import reverse
from django.test.client import Client
from mitxmako.shortcuts import render_to_string
from edxmako.shortcuts import render_to_string
from student.tests.factories import UserFactory, CourseEnrollmentFactory
from courseware.tests.modulestore_config import TEST_DATA_MIXED_MODULESTORE
from xblock.field_data import DictFieldData

2
lms/djangoapps/courseware/tests/test_views.py
View File

@@ -17,7 +17,7 @@ from django.core.urlresolvers import reverse
from student.models import CourseEnrollment
from student.tests.factories import AdminFactory
from mitxmako.middleware import MakoMiddleware
from edxmako.middleware import MakoMiddleware
from xmodule.modulestore import Location
from xmodule.modulestore.django import modulestore