Skip to content
Snippets Groups Projects
Commit 130e9d0b authored by Konstantin Gertsenberger's avatar Konstantin Gertsenberger
Browse files

Merge remote-tracking branch 'origin/dev' into event_display_update

parents 7a7c7eef 6a52e2d8
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 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