Skip to content
Snippets Groups Projects
  • jojohoch's avatar
    77915dda
    Merge branch 'master' into feature/schemer · 77915dda
    jojohoch authored
    # Conflicts:
    #	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.ts
    #	projects/common/models/elements/input-elements/slider.ts
    #	projects/common/models/elements/text/text.ts
    #	projects/editor/src/app/services/unit.service.ts
    77915dda
    History
    Merge branch 'master' into feature/schemer
    jojohoch authored
    # Conflicts:
    #	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.ts
    #	projects/common/models/elements/input-elements/slider.ts
    #	projects/common/models/elements/text/text.ts
    #	projects/editor/src/app/services/unit.service.ts
Code owners
Assign users and groups as approvers for specific file changes. Learn more.