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.66.0-develop #11277

Merged
merged 15 commits into from
Jun 28, 2018
Merged

Merge master into develop & Set version to 0.66.0-develop #11277

merged 15 commits into from
Jun 28, 2018

Conversation

rodrigok
Copy link
Member

No description provided.

brylie and others added 15 commits January 28, 2018 14:50
@brylie
Semantic markup
f57fd07
@stuartpb
Fix spelling of "collaborative"
047e6f3
@engelgabriel
Merge branch 'master' into patch-1
da7e38c
@engelgabriel
Merge pull request #9534 from brylie/patch-1
c1845df 
[FIX] i18n - add semantic markup
@engelgabriel
Merge branch 'master' into patch-1
bd99dae
@engelgabriel
Merge pull request #10134 from stuartpb/patch-1
a0c709c 
[FIX] Fix spelling of "collaborative"
@Hudell @sampaiodiego
[FIX] Wordpress OAuth not providing enough info to log in (#11152)
e5333d4
@engelgabriel @sampaiodiego
Merge pull request #10998 from vynmera/fix-lazy-load-big-images-becau…
7897a29 
…se-they-are-a-bit-too-big

[FIX] Preview of large images scrollbars because not resizing the to fit area
@sampaiodiego
[FIX] users model not receiving options (#11129)
78ca556
@sampaiodiego
Bump version to 0.65.2
fbb72df
@engelgabriel @sampaiodiego
Bump version to 0.65.2
138345c
@engelgabriel @sampaiodiego
Merge pull request #11049 from RocketChat/fix-admin-tab-icons
ad3abbb 
[FIX] flex-tab icons missing
@sampaiodiego
Merge pull request #11167 from RocketChat/release-0.65.2
706a528 
Release 0.65.2
@rodrigok
Merge remote-tracking branch 'origin/master' into develop-sync
83f4832 
# Conflicts:
#	.docker/Dockerfile
#	.docker/Dockerfile.rhel
#	.github/history.json
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	HISTORY.md
#	package.json
#	packages/rocketchat-i18n/i18n/en.i18n.json
#	packages/rocketchat-lib/rocketchat.info
#	packages/rocketchat-wordpress/common.js
@rodrigok
Bump version to 0.66.0-develop
4f6c331
@CLAassistant
Copy link

CLAassistant commented Jun 28, 2018 •
edited
Loading

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
5 out of 6 committers have signed the CLA.

✅ engelgabriel
✅ stuartpb
✅ Hudell
✅ sampaiodiego
✅ rodrigok
❌ brylie
You have signed the CLA already but the status is still pending? Let us recheck it.

@rodrigok rodrigok merged commit c413029 into develop Jun 28, 2018
@rodrigok rodrigok deleted the develop-sync branch June 28, 2018 00:49
@rodrigok rodrigok mentioned this pull request Jun 28, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@rodrigok @CLAassistant @brylie @stuartpb @engelgabriel @Hudell @sampaiodiego