Skip to content
Commit aa3204d6 authored by Renato Becker's avatar Renato Becker
Browse files

Merge branch 'develop' into deactivate-fields-in-the-livechat-registration-form

# Conflicts:
#	package-lock.json
#	server/startup/migrations/v113.js
parents c351ae0f d8afb60e
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