Merge branch 'master' into 'production' (51011bf5) · Commits · MCC APSIS / NACSOS / NACSOS Core · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

N

NACSOS Core
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

51011bf5

Commit 51011bf5 authored 1 year ago by Tim Repke

Downloads
- Plain Diff

Merge branch 'master' into 'production'

Master

See merge request !37

parents d5f8a698 bea803f0

No related branches found

No related tags found

1 merge request!37Master

Pipeline #1298 passed 1 year ago

Stage: build

Stage: test

Stage: deploy

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

requirements.txt 3 additions, 3 deletions

requirements.txt
requirements_dev.txt 3 additions, 3 deletions

requirements_dev.txt
server/api/__init__.py 4 additions, 0 deletions

server/api/__init__.py
server/api/routes/annotations.py 19 additions, 3 deletions

server/api/routes/annotations.py
server/api/routes/highlight.py 86 additions, 0 deletions

server/api/routes/highlight.py

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