Skip to content

Conversation

@rodrigok
Copy link
Member

No description provided.

pierre-lehnen-rc and others added 27 commits May 1, 2020 00:37
* Disable push settings if gateway is selected

* Use variable for enableQueries

Co-authored-by: Diego Sampaio <[email protected]>
* Fixed Link import

* Fixed import of named URLs, since pipes get encoded as %7C we can safely escape |
…3.3.0

# Conflicts:
#	.docker/Dockerfile.rhel
#	.github/history.json
#	HISTORY.md
#	app/lib/server/startup/settings.js
#	app/utils/rocketchat.info
#	package-lock.json
#	package.json
@sampaiodiego sampaiodiego merged commit 8eead18 into develop Jun 1, 2020
@sampaiodiego sampaiodiego deleted the develop-sync branch June 1, 2020 12:58
@sampaiodiego sampaiodiego mentioned this pull request Jun 30, 2020
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