Skip to content
Snippets Groups Projects
Commit 91b0dc9a authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'develop' into F14320_Allow_specific_HTML_Tags_TinyMCE

# Conflicts:
#	Documentation/License.rst
parents fac6cb1c 568708de
No related branches found
No related tags found
Loading
Checking pipeline status
Showing
with 330 additions and 179 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