Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Support multiple integration managers behind a labs flag #3341

Merged
merged 5 commits into from
Aug 27, 2019
Merged

Support multiple integration managers behind a labs flag #3341

merged 5 commits into from
Aug 27, 2019

Commits on Aug 23, 2019

  1. Merge branch 'travis/homeserver-managers' into travis/tabbed-managers

    @turt2live
    turt2live committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    602c338 View commit details
    Browse the repository at this point in the history

  2. Support multiple integration managers behind a labs flag 

    Fixes element-hq/element-web#10622
Implements [MSC1957](matrix-org/matrix-spec-proposals#1957)

Design is not final.
    @turt2live
    turt2live committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    b3cda4b View commit details
    Browse the repository at this point in the history

  3. Appease the linter

    @turt2live
    turt2live committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    160396c View commit details
    Browse the repository at this point in the history

  4. Appease the scss linter

    @turt2live
    turt2live committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    266e3af View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2019

  1. Merge branch 'develop' into travis/tabbed-managers

    @turt2live
    turt2live committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    3eddded View commit details
    Browse the repository at this point in the history