Merge branch 'integration' of... (2581c211) · Commits · flame / flame-clmc · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

F

flame-clmc
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

2581c211

Commit 2581c211 authored 6 years ago by Michael Boniface

Downloads
- Plain Diff

Merge branch 'integration' of...

Merge branch 'integration' of gitlab.it-innovation.soton.ac.uk:FLAME/consortium/3rdparties/flame-clmc

parents 791eb828 1dbfd0f6

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

scripts/clmc-service/nginx.conf 18 additions, 0 deletions

scripts/clmc-service/nginx.conf
src/service/clmcservice/alertsapi/tests.py 1 addition, 1 deletion

src/service/clmcservice/alertsapi/tests.py
src/service/clmcservice/alertsapi/views.py 1 addition, 1 deletion

src/service/clmcservice/alertsapi/views.py

with 20 additions and 2 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