Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

edx-platform-release
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

fa81f303

Commit fa81f303 authored 8 years ago by Brian Beggs Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #13735 from edx/release

Merge release -> master for release-2016-10-12

parents a9c548c3 9629e5bd

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

common/lib/xmodule/xmodule/capa_base.py 9 additions, 6 deletions

common/lib/xmodule/xmodule/capa_base.py
common/lib/xmodule/xmodule/tests/test_capa_module.py 31 additions, 1 deletion

common/lib/xmodule/xmodule/tests/test_capa_module.py
common/static/sass/edx-pattern-library-shims/_buttons.scss 3 additions, 3 deletions

common/static/sass/edx-pattern-library-shims/_buttons.scss

with 43 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment