Skip to content
Snippets Groups Projects
Commit f18cd158 authored by enured's avatar enured
Browse files

Merge remote-tracking branch 'origin/develop' into F17462_formelement_chat 

# Conflicts:
#	extension/Classes/Sql/qfqDefaultTables.sql
#	less/qfq-bs.css.less
parents 60f4448c 66493c62
No related branches found
No related tags found
2 merge requests!691New version v24.3.0,!667F17540: FE Chat v1.2
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 965 additions and 225 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