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

Add option to control on-domain messages #303

Merged
merged 2 commits into from
Dec 18, 2018
Merged

Add option to control on-domain messages #303

merged 2 commits into from
Dec 18, 2018

Conversation

psiinon
Copy link
Member

@psiinon psiinon commented Dec 17, 2018 •
edited
Loading

Fixes #294

dscrobonia
dscrobonia approved these changes Dec 17, 2018
View reviewed changes
Copy link
Contributor

@dscrobonia dscrobonia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@thc202
Copy link
Member

thc202 commented Dec 17, 2018

This needs an update of the changelog :)

@psiinon
Copy link
Member Author

psiinon commented Dec 18, 2018

Arg, I'll get used to this new dev route at some point...

@psiinon psiinon force-pushed the feature/disable-ondomain branch from 89db00c to 3688dec Compare December 18, 2018 09:15
@psiinon
Copy link
Member Author

psiinon commented Dec 18, 2018

Added changelog entry

@psiinon psiinon force-pushed the feature/disable-ondomain branch from 3688dec to cef598e Compare December 18, 2018 15:12
@psiinon
Merge remote-tracking branch 'origin/develop' into
46e0294 
feature/disable-ondomain

Conflicts:
	CHANGELOG.md
@psiinon psiinon force-pushed the feature/disable-ondomain branch from d3914bb to 46e0294 Compare December 18, 2018 15:24
@thc202 thc202 merged commit 205222b into zaproxy:develop Dec 18, 2018
@thc202
Copy link
Member

thc202 commented Dec 18, 2018

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dscrobonia dscrobonia dscrobonia approved these changes

@thc202 thc202 thc202 approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@psiinon @thc202 @dscrobonia