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

97b67c31

Verified Commit 97b67c31 authored 5 years ago by Jonathan Weth

Downloads
- Plain Diff

Merge branch 'master' into merge/pwa

# Conflicts:
#	pyproject.toml

parents d22dc2b1 05aca4f2

No related branches found

No related tags found

1 merge request!99Add PWA to AlekSIS

Pipeline #511 canceled 5 years ago

Stage: test

Stage: build

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

aleksis/core/settings.py 8 additions, 5 deletions

aleksis/core/settings.py
aleksis/core/static/theme.scss 2 additions, 2 deletions

aleksis/core/static/theme.scss
aleksis/core/util/sass_helpers.py 1 addition, 1 deletion

aleksis/core/util/sass_helpers.py
poetry.lock 10 additions, 7 deletions

poetry.lock
pyproject.toml 1 addition, 1 deletion

pyproject.toml

with 22 additions and 16 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