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

b6a5bea0

Commit b6a5bea0 authored 10 years ago by Adam

Downloads
- Plain Diff

Merge pull request #5400 from edx/merge-conflicts-release

Merge conflicts release

parents 792c8eaf 01f2f81c

No related merge requests found

Changes 1

Hide whitespace changes

Inline Side-by-side

Showing

common/static/js/vendor/ova/OpenSeaDragonAnnotation.js 10 additions, 5 deletions

common/static/js/vendor/ova/OpenSeaDragonAnnotation.js

with 10 additions and 5 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