Skip to content
Snippets Groups Projects
Commit a58d9073 authored by jojohoch's avatar jojohoch
Browse files

Merge branch 'master' into feature/schemer

# Conflicts:
#	projects/common/models/elements/compound-elements/cloze/cloze-child-elements/drop-list-simple.ts
#	projects/common/models/elements/compound-elements/cloze/cloze-child-elements/text-field-simple.ts
#	projects/common/models/elements/compound-elements/cloze/cloze-child-elements/toggle-button.ts
#	projects/common/models/elements/compound-elements/likert/likert-row.ts
#	projects/common/models/elements/element.ts
#	projects/common/models/elements/input-elements/checkbox.ts
#	projects/common/models/elements/input-elements/drop-list.ts
#	projects/common/models/elements/input-elements/dropdown.ts
#	projects/common/models/elements/input-elements/radio-button-group-complex.ts
#	projects/common/models/elements/input-elements/radio-button-group.ts
#	projects/common/models/elements/input-elements/slider.ts
#	projects/common/models/elements/input-elements/spell-correct.ts
#	projects/common/models/elements/input-elements/text-area.ts
#	projects/common/models/elements/input-elements/text-field.ts
#	projects/common/models/elements/text/text.ts
#	projects/common/models/section.ts
#	projects/editor/src/app/services/verona-api.service.ts
parents b5e5209b 311a48db
No related branches found
No related tags found
No related merge requests found
Showing
with 1019 additions and 1012 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