Merge pull request #7786 from edx/release (2f3ff43e) · Commits · Hsin-Yu Chien / edx-platform-release · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

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

Snippets Groups Projects

2f3ff43e

Commit 2f3ff43e authored 9 years ago by Diana Huang

Downloads
- Plain Diff

Merge pull request #7786 from edx/release

Merge release back into master

parents 43772531 00b75f01

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

lms/envs/aws.py 2 additions, 0 deletions

lms/envs/aws.py
lms/envs/common.py 1 addition, 3 deletions

lms/envs/common.py
lms/static/js/views/fields.js 1 addition, 1 deletion

lms/static/js/views/fields.js
lms/templates/fields/field_image.underscore 1 addition, 1 deletion

lms/templates/fields/field_image.underscore

with 5 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