-
- Downloads
Merge branch 'master' of gitlab.fachschaften.org:kif/akplanning into feature-custom-admin
# Conflicts: # AKModel/locale/de_DE/LC_MESSAGES/django.po # AKPlanning/locale/de_DE/LC_MESSAGES/django.po # AKPlanning/settings.py # AKSubmission/locale/de_DE/LC_MESSAGES/django.po # locale/de_DE/LC_MESSAGES/django.po
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 27 additions, 0 deletions.gitlab-ci.yml
- AKDashboard/locale/de_DE/LC_MESSAGES/django.po 1 addition, 1 deletionAKDashboard/locale/de_DE/LC_MESSAGES/django.po
- AKModel/admin.py 3 additions, 3 deletionsAKModel/admin.py
- AKModel/locale/de_DE/LC_MESSAGES/django.po 56 additions, 58 deletionsAKModel/locale/de_DE/LC_MESSAGES/django.po
- AKModel/migrations/0017_owner_slug.py 3 additions, 4 deletionsAKModel/migrations/0017_owner_slug.py
- AKModel/migrations/0028_unique_constraints.py 0 additions, 4 deletionsAKModel/migrations/0028_unique_constraints.py
- AKModel/migrations/0033_AKOnline.py 17 additions, 0 deletionsAKModel/migrations/0033_AKOnline.py
- AKModel/models.py 8 additions, 9 deletionsAKModel/models.py
- AKOnline/__init__.py 0 additions, 0 deletionsAKOnline/__init__.py
- AKOnline/admin.py 9 additions, 0 deletionsAKOnline/admin.py
- AKOnline/apps.py 5 additions, 0 deletionsAKOnline/apps.py
- AKOnline/migrations/0001_AKOnline.py 29 additions, 0 deletionsAKOnline/migrations/0001_AKOnline.py
- AKOnline/migrations/__init__.py 0 additions, 0 deletionsAKOnline/migrations/__init__.py
- AKOnline/models.py 14 additions, 0 deletionsAKOnline/models.py
- AKOnline/tests.py 1 addition, 0 deletionsAKOnline/tests.py
- AKOnline/views.py 1 addition, 0 deletionsAKOnline/views.py
- AKPlan/locale/de_DE/LC_MESSAGES/django.po 1 addition, 1 deletionAKPlan/locale/de_DE/LC_MESSAGES/django.po
- AKPlan/views.py 2 additions, 2 deletionsAKPlan/views.py
- AKPlanning/settings.py 1 addition, 0 deletionsAKPlanning/settings.py
- AKPlanning/settings_ci.py 21 additions, 0 deletionsAKPlanning/settings_ci.py
Loading
Please register or sign in to comment