Skip to content

Escape some more output#324

Merged
GaryJones merged 2 commits intodevelopfrom
feature/escape-some-more
Apr 24, 2015
Merged

Escape some more output#324
GaryJones merged 2 commits intodevelopfrom
feature/escape-some-more

Conversation

@jrfnl
Copy link
Copy Markdown
Contributor

@jrfnl jrfnl commented Apr 23, 2015

And found some more output which needs escaping

@jrfnl jrfnl added this to the 2.5.0 milestone Apr 23, 2015
@GaryJones
Copy link
Copy Markdown
Member

Conflicting.

…ion into feature/escape-some-more

Conflicts:
	class-tgm-plugin-activation.php
@jrfnl
Copy link
Copy Markdown
Contributor Author

jrfnl commented Apr 24, 2015

Conflicts solved (was due to the other escaping PR)

GaryJones added a commit that referenced this pull request Apr 24, 2015
@GaryJones GaryJones merged commit 708e1ca into develop Apr 24, 2015
@GaryJones GaryJones deleted the feature/escape-some-more branch April 24, 2015 07:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants