Skip to content
Snippets Groups Projects
Commit 4b68e115 authored by Tom Käsler's avatar Tom Käsler
Browse files

Merge branch 'prepare-1.2' into 'master' 

Prepare 1.2

See merge request arsnova/arsnova-lite!277
parents 3e352eb9 8890e068
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 367 additions and 12342 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