Merge remote-tracking branch 'origin/release' into merge-release-into-master (f4cf6181) · 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

f4cf6181

Commit f4cf6181 authored 8 years ago by Diana Huang

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/release' into merge-release-into-master

parents b3dc4561 c5392cb8

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

common/static/common/js/discussion/views/discussion_topic_menu_view.js 27 additions, 7 deletions

.../common/js/discussion/views/discussion_topic_menu_view.js
common/static/common/js/spec/discussion/view/discussion_topic_menu_view_spec.js 23 additions, 2 deletions

...s/spec/discussion/view/discussion_topic_menu_view_spec.js
scripts/safelint_thresholds.json 2 additions, 2 deletions

scripts/safelint_thresholds.json

with 52 additions and 11 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