Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AlekSIS-App-Hjelp
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

680f9d80

Commit 680f9d80 authored 5 years ago by Julian

Downloads
- Plain Diff

Merge branch 'master' into include-my-work-from-our-last-meeting

# Conflicts:
#	aleksis/apps/hjelp/models.py

parents c4b1c03a 9276983c

No related branches found

No related tags found

1 merge request!6Add ckeditor in FAQ questions admin interface

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

LICENCE 191 additions, 0 deletions

LICENCE
aleksis/apps/hjelp/models.py 17 additions, 4 deletions

aleksis/apps/hjelp/models.py
aleksis/apps/hjelp/templates/hjelp/rebus.html 1 addition, 1 deletion

aleksis/apps/hjelp/templates/hjelp/rebus.html
aleksis/apps/hjelp/views.py 2 additions, 2 deletions

aleksis/apps/hjelp/views.py
poetry.lock 27 additions, 107 deletions

poetry.lock

with 238 additions and 114 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