Skip to content
Snippets Groups Projects
Commit 3822e202 authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

Merge branch '2020.1' 

# Conflicts:
#	entity/Appointment_entity/entityfields/begin/valueProcess.js
#	entity/Appointment_entity/entityfields/end/valueProcess.js
parents 44e65555 4f9a08ea
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 388 additions and 200 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