Skip to content
Snippets Groups Projects
Commit 1bba0e57 authored by S.Listl's avatar S.Listl
Browse files

Merge origin/master 

Conflicts:
	entity/Offer_entity/Offer_entity.aod
	entity/Order_entity/Order_entity.aod
	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
parents 570e077f 725194d1
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3171 additions and 3257 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