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.

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

Fix order of decoding entities (#1049) #1050

Merged
merged 1 commit into from
Nov 9, 2016

Conversation

Rob--W
Copy link
Contributor

@Rob--W Rob--W commented Nov 8, 2016

Fixes #1049

Tested that npm test -- --language=groovy with the new test file fails before the patch, and that it passes after applying the patch.

@Golmote Golmote merged commit d75da8e into PrismJS:gh-pages Nov 9, 2016
thesave added a commit to thesave/prism that referenced this pull request Nov 9, 2016
* PrismJS/gh-pages:
  Plugins: Toolbar & Copy to Clipboard (PrismJS#891)
  Ini: Fix test after  PrismJS#1047
  Add support for the Jolie language (PrismJS#1014)
  Fix order of decoding entities in groovy (PrismJS#1049) (PrismJS#1050)
  Ruby: Make strings greedy. Fixes PrismJS#1048
  Ini: Remove newline at end of minified file.
  Ruby: Fix test after PrismJS#1023
  Remove important token in ini definition (PrismJS#1047)
  Add missing `from` keyword to typescript & set `ts` as alias. (PrismJS#1042)
  Fix greedy-flag bug
  Add yarn.lock (PrismJS#1035)
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.

2 participants