Conflicts: .gitmodules common/djangoapps/__init__.py common/djangoapps/track/migrations/__init__.py common/lib/capa/capa/inputtypes.py common/lib/capa/capa/responsetypes.py common/lib/capa/capa/templates/openendedinput.html common/lib/xmodule/xmodule/course_module.py common/lib/xmodule/xmodule/video_module.py common/static/sass/bourbon/css3/_box-sizing.scss doc/development.md lms/djangoapps/instructor/tests.py lms/envs/aws.py lms/envs/common.py lms/templates/video.html requirements.txt test-requirements.txt
11 lines
83 B
Plaintext
11 lines
83 B
Plaintext
django-nose
|
|
coverage
|
|
nosexcover
|
|
pylint
|
|
pep8
|
|
lettuce
|
|
selenium
|
|
factory_boy
|
|
splinter
|
|
|