Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

steering
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

7fedd9d2

Commit 7fedd9d2 authored 13 years ago by Johannes Raggam

Downloads
- Plain Diff

Merge branch 'master' of github.com:nnrcschmdt/helsinki

parents b8192f77 f77ca392

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

TODO 0 additions, 2 deletions

TODO
program/admin.py 4 additions, 12 deletions

program/admin.py
program/models.py 2 additions, 2 deletions

program/models.py
program/urls.py 0 additions, 4 deletions

program/urls.py
templates/program/show_detail.html 7 additions, 0 deletions

templates/program/show_detail.html
templates/program/timeslot_detail.html 1 addition, 1 deletion

templates/program/timeslot_detail.html

with 14 additions and 21 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