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

get rid of bluebird #3593

Merged
merged 5 commits into from
Nov 21, 2019
Merged

get rid of bluebird #3593

merged 5 commits into from
Nov 21, 2019

Commits on Nov 18, 2019

  1. Rip out the remainder of Bluebird

    @t3chguy
    t3chguy committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    d4d51dc View commit details
    Browse the repository at this point in the history

  2. Merge branch 't3chguy/remove_bluebird_2' of https://github.com/matrix… 

    …-org/matrix-react-sdk into t3chguy/remove_bluebird

� Conflicts:
�	src/components/views/right_panel/UserInfo.js
    @t3chguy
    t3chguy committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    5c172a3 View commit details
    Browse the repository at this point in the history

  3. remove Promise.config

    @t3chguy
    t3chguy committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    e144f1c View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2019

  1. Merge branch 'develop' into t3chguy/remove_bluebird

    @t3chguy
    t3chguy committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    6121420 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2019

  1. Merge branches 'develop' and 't3chguy/remove_bluebird' of github.com:… 

    …matrix-org/matrix-react-sdk into t3chguy/remove_bluebird
    @t3chguy
    t3chguy committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    d3f872b View commit details
    Browse the repository at this point in the history