Skip to content
Snippets Groups Projects
Select Git revision
1 result Searching

collaboration.module.ts

  • OZGCloud's avatar
    87f040ca
    Merge remote-tracking branch 'origin/ozg-6300-accordion-zusammenarbeit' into... · 87f040ca
    OZGCloud authored
    Merge remote-tracking branch 'origin/ozg-6300-accordion-zusammenarbeit' into OZG-6302-AnfrageFormular
    
    # Conflicts:
    #	alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang-container.component.html
    #	alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang-container.component.spec.ts
    #	alfa-client/libs/collaboration/src/lib/collaboration.module.ts
    87f040ca
    History
    Merge remote-tracking branch 'origin/ozg-6300-accordion-zusammenarbeit' into...
    OZGCloud authored
    Merge remote-tracking branch 'origin/ozg-6300-accordion-zusammenarbeit' into OZG-6302-AnfrageFormular
    
    # Conflicts:
    #	alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang-container.component.html
    #	alfa-client/libs/collaboration/src/lib/collaboration-in-vorgang-container/collaboration-in-vorgang-container.component.spec.ts
    #	alfa-client/libs/collaboration/src/lib/collaboration.module.ts