Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

relate
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

7bc62883

Commit 7bc62883 authored 9 years ago by Andreas Klöckner

Downloads
- Plain Diff

Merge branch 'master' into custom-user-model

parents d85e910e 72aa55c0

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

.gitignore
course/admin.py 18 additions, 10 deletions

course/admin.py
course/content.py 19 additions, 5 deletions

course/content.py
course/models.py 12 additions, 0 deletions

course/models.py
course/page/code.py 48 additions, 31 deletions

course/page/code.py
course/versioning.py 3 additions, 43 deletions

course/versioning.py
local_settings.py.example 19 additions, 0 deletions

local_settings.py.example
relate/settings.py 5 additions, 2 deletions

relate/settings.py
requirements.txt 1 addition, 1 deletion

requirements.txt

with 127 additions and 92 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