Merge branch 'master' into 'renovate/django-otp-0.x'
# Conflicts: # poetry.lock
No related branches found
No related tags found
Showing
- aleksis/core/apps.py 10 additions, 4 deletionsaleksis/core/apps.py
- aleksis/core/models.py 3 additions, 3 deletionsaleksis/core/models.py
- aleksis/core/static/img/aleksis-banner.svg 453 additions, 0 deletionsaleksis/core/static/img/aleksis-banner.svg
- aleksis/core/templates/core/base.html 2 additions, 1 deletionaleksis/core/templates/core/base.html
- aleksis/core/util/notifications.py 2 additions, 2 deletionsaleksis/core/util/notifications.py
- poetry.lock 23 additions, 31 deletionspoetry.lock
- pyproject.toml 4 additions, 4 deletionspyproject.toml
Loading
Please register or sign in to comment