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

4ebe2669

Commit 4ebe2669 authored 10 years ago by Don Mitchell

Downloads
- Plain Diff

Merge branch 'release'

Conflicts:
	common/djangoapps/student/views.py

parents 02a28510 789193ef

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

common/djangoapps/student/views.py 5 additions, 5 deletions

common/djangoapps/student/views.py
lms/templates/dashboard.html 2 additions, 1 deletion

lms/templates/dashboard.html
lms/templates/login.html 1 addition, 1 deletion

lms/templates/login.html
lms/templates/register.html 1 addition, 1 deletion

lms/templates/register.html
requirements/edx/base.txt 1 addition, 1 deletion

requirements/edx/base.txt

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