Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AlekSIS-Core
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

7f18103c

Commit 7f18103c authored 3 weeks ago by Jonathan Weth

Downloads
- Plain Diff

Merge branch 'master' into 'fix-dialog-object-forms-internal-dialog-mode-handling'

# Conflicts:
#   CHANGELOG.rst
#   aleksis/core/frontend/components/generic/dialogs/DialogObjectForm.vue

parents 00db3b30 95a0c650

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.rst 2 additions, 0 deletions

CHANGELOG.rst
aleksis/core/frontend/components/calendar/calendarSelectedFeedsMixin.js 5 additions, 3 deletions

...rontend/components/calendar/calendarSelectedFeedsMixin.js
aleksis/core/frontend/components/generic/dialogs/DialogObjectForm.vue 1 addition, 1 deletion

.../frontend/components/generic/dialogs/DialogObjectForm.vue
pyproject.toml 1 addition, 1 deletion

pyproject.toml

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