Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AKPlanning
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

c45978b8

Commit c45978b8 authored 4 years ago by Nadja Geisler

Downloads
- Plain Diff

Merge branch 'master' into 'feature-custom-admin'

# Conflicts:
#   AKSubmission/locale/de_DE/LC_MESSAGES/django.po

parents 01e7d3c0 01ccf980

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

AKPlan/locale/de_DE/LC_MESSAGES/django.po 17 additions, 5 deletions

AKPlan/locale/de_DE/LC_MESSAGES/django.po
AKPlan/templates/AKPlan/plan_akslot.html 2 additions, 1 deletion

AKPlan/templates/AKPlan/plan_akslot.html
AKPlan/templates/AKPlan/plan_index.html 1 addition, 1 deletion

AKPlan/templates/AKPlan/plan_index.html
AKPlan/templates/AKPlan/plan_room.html 30 additions, 1 deletion

AKPlan/templates/AKPlan/plan_room.html
AKSubmission/locale/de_DE/LC_MESSAGES/django.po 7 additions, 7 deletions

AKSubmission/locale/de_DE/LC_MESSAGES/django.po
AKSubmission/templates/AKSubmission/ak_detail.html 7 additions, 1 deletion

AKSubmission/templates/AKSubmission/ak_detail.html
AKSubmission/templates/AKSubmission/submission_not_configured.html 1 addition, 1 deletion

...ion/templates/AKSubmission/submission_not_configured.html

with 65 additions and 17 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