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

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

# Conflicts:
#   CHANGELOG.md
#   cernbase.info.yml
#   cernbase.theme
parents c3d8f041 beeebb68
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 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