Skip to content
Snippets Groups Projects
Commit 9a69894d authored by Alexander Vögl's avatar Alexander Vögl
Browse files

Merge branch '2020.1' into '2020.1.0_OrderRefactoring'

# Conflicts:
#   entity/Order_entity/Order_entity.aod
parents c63f4ea3 04417d6c
No related branches found
No related tags found
No related merge requests found
Showing
with 329 additions and 182 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