Skip to content
Snippets Groups Projects
Commit e8b24e9a authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'master' into 'release-3.0' 

# Conflicts:
#   aleksis/apps/chronos/frontend/messages/ru.json
#   aleksis/apps/chronos/frontend/messages/uk.json
parents c08702e1 47c34bea
No related branches found
No related tags found
Checking pipeline status
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