Merge master conflicts #66
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merging with master without deployment
changes for master to push image in aws repo.
changes in deployment script.
v5 and other miner changes
supporting cc, bcc, from and categories fields are optional.
Prod- M2M deployment
PROD - m2m, correcting circleci var
sendgrid v3 Api, response logging and lib vulnerability fixes.
STS (MSv1.3) deployment
Clean-up & changes in max message size consumer option
Fixing Sendgrid lib issue
Decoupling sendgrid template id from Kafka topic
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.