Skip to content
Snippets Groups Projects
Commit 0cbbe161 authored by David Büchler's avatar David Büchler
Browse files

Merge remote-tracking branch 'origin/stable2019.3' into #1040035-Dublettenermittlung

# Conflicts:
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
#	neonView/OfferEdit_view/OfferEdit_view.aod
#	neonView/PrivatePersonPreview_view/PrivatePersonPreview_view.aod
#	neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
parents a27ceaa6 3e93a60d
No related branches found
No related tags found
No related merge requests found
Showing
with 147 additions and 21 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