Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master into develop & Set version to 0.67.0-develop #11290

Merged
merged 13 commits into from
Jun 29, 2018
Merged

Merge master into develop & Set version to 0.67.0-develop #11290

merged 13 commits into from
Jun 29, 2018

Commits on Jun 21, 2018

  1. Bump version to 0.66.0-rc.0

    @rodrigok
    rodrigok committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    ba166a1 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into release-candidate

    @rodrigok
    rodrigok committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    d44deb0 View commit details
    Browse the repository at this point in the history

  3. Bump version to 0.66.0-rc.1

    @rodrigok
    rodrigok committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    b86c933 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2018

  1. Merge remote-tracking branch 'origin/develop' into release-candidate 

    # Conflicts:
#	.github/history.json
#	HISTORY.md
    @rodrigok
    rodrigok committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    ece518f View commit details
    Browse the repository at this point in the history

  2. Bump version to 0.66.0-rc.2

    @rodrigok
    rodrigok committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    7872d4c View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2018

  1. Merge remote-tracking branch 'origin/develop' into release-candidate

    @rodrigok
    rodrigok committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    3ebb2d0 View commit details
    Browse the repository at this point in the history

  2. Bump version to 0.66.0-rc.3

    @rodrigok
    rodrigok committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    20e73ce View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2018

  1. Merge remote-tracking branch 'origin/develop' into release-candidate

    @rodrigok
    rodrigok committed Jun 28, 2018
    Configuration menu
    Copy the full SHA
    76e14df View commit details
    Browse the repository at this point in the history

  2. Bump version to 0.66.0-rc.4

    @rodrigok
    rodrigok committed Jun 28, 2018
    Configuration menu
    Copy the full SHA
    1c108ae View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into release-candidate 

    # Conflicts:
#	.sandstorm/sandstorm-pkgdef.capnp
    @rodrigok
    rodrigok committed Jun 28, 2018
    Configuration menu
    Copy the full SHA
    e20c61c View commit details
    Browse the repository at this point in the history

  4. Bump version to 0.66.0

    @rodrigok
    rodrigok committed Jun 28, 2018
    Configuration menu
    Copy the full SHA
    0800ab0 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #11278 from RocketChat/release-0.66.0 

    Release 0.66.0
    @rodrigok
    rodrigok committed Jun 28, 2018
    Configuration menu
    Copy the full SHA
    5aa08cb View commit details
    Browse the repository at this point in the history

  6. Bump version to 0.67.0-develop

    @rodrigok
    rodrigok committed Jun 28, 2018
    Configuration menu
    Copy the full SHA
    2e958ca View commit details
    Browse the repository at this point in the history