Skip to content
Snippets Groups Projects
Commit 632e9192 authored by Konstantinos Platis's avatar Konstantinos Platis
Browse files

Merge branch 'master' into 'rc-v2.4.0' 

# Conflicts:
#   CHANGELOG.md
#   cern_components.info.yml
parents 44b7c530 3bb32de5
No related branches found
No related tags found
2 merge requests!29Update dev w/ latest version of master,!28Merge v2.4.0 into master
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
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