Skip to content
Snippets Groups Projects
Commit 2d9c4d64 authored by Sebastian Pongratz's avatar Sebastian Pongratz :ping_pong:
Browse files

Merge branch '2021.2.3' into 2021.2

# Conflicts:
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
parents f8c0316c fd37a611
No related branches found
No related tags found
No related merge requests found
Showing
with 96 additions and 0 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment