Skip to content

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

Merged
rodrigok merged 15 commits intodevelopfrom
develop-sync
Jun 28, 2018
Merged

Merge master into develop & Set version to 0.66.0-develop#11277
rodrigok merged 15 commits intodevelopfrom
develop-sync

Conversation

@rodrigok
Copy link
Member

No description provided.

brylie and others added 15 commits January 28, 2018 14:50
[FIX] i18n - add semantic markup
[FIX] Fix spelling of "collaborative"
…se-they-are-a-bit-too-big

[FIX] Preview of large images scrollbars because not resizing the to fit area
# 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
@CLAassistant
Copy link

CLAassistant commented Jun 28, 2018

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

Comments