Skip to content
Snippets Groups Projects
Commit d8e76689 authored by Bjarke Madsen's avatar Bjarke Madsen
Browse files

Merge branch 'develop' of gitlab.geant.net:live-projects/brian-dashboard-manager into develop

parents 1799663e 4d56994e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
changelog.md
+ 4
− 0
View file @ d8e76689
<<<<<<< HEAD
=======
>>>>>>> release/0.1
# Changelog
All notable changes to this project will be documented in this file.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment