Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
d88aad7d
Commit
d88aad7d
authored
May 10, 2016
by
Brian Jacobel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release' into bjacobel/fix-release-2016-05-10-merge-conflicts-with-master
parents
64041503
8a5a69f4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
1 deletions
+0
-1
common/test/acceptance/tests/lms/test_lms.py
+0
-1
No files found.
common/test/acceptance/tests/lms/test_lms.py
View file @
d88aad7d
...
...
@@ -9,7 +9,6 @@ from unittest import skip
from
nose.plugins.attrib
import
attr
import
pytz
import
urllib
from
..helpers
import
skip_if_browser
from
bok_choy.promise
import
EmptyPromise
from
..helpers
import
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment