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

Add support for XQuery #1411

Merged
merged 2 commits into from
May 26, 2018
Merged

Add support for XQuery #1411

merged 2 commits into from
May 26, 2018

Conversation

Golmote
Copy link
Contributor

@Golmote Golmote commented Apr 28, 2018

Fix #1405

# Conflicts:
#	components.js
#	plugins/autoloader/prism-autoloader.js
#	plugins/autoloader/prism-autoloader.min.js
#	plugins/show-language/prism-show-language.js
#	plugins/show-language/prism-show-language.min.js
@Golmote Golmote merged commit e326cb0 into PrismJS:gh-pages May 26, 2018
@Golmote Golmote deleted the xquery branch May 26, 2018 09:39
mAAdhaTTah added a commit that referenced this pull request Jun 5, 2018
* gh-pages: (33 commits)
  Add double-class specificity hack (#1435)
  Moved tutorial link to the end of the list
  Make line-numbers styles more specific
  Fix mixed content warning
  Create CNAME
  Delete CNAME
  Update documentation for node & webpack usage
  Handle optional dependencies in `loadLanguages()` (#1417)
  Add `objectpascal` as an alias to `pascal` (see #1426)
  Add support for XQuery. Fix #1405 (#1411)
  Website: Fix Download page not handling multiple dependencies when from Redownload URL
  JSX: Add support for fragments short syntax. Fix #1421
  Support for Template Toolkit 2 (#1418)
  ASP.NET should require C#
  Run gulp
  Move guard into conditional and check for language
  Don't process language if block language not set
  JSX: Allow for two levels of nesting inside JSX tags. Fix #1408
  Add missing reference to issue in specific test.
  Powershell: Allow for one level of nesting in expressions inside strings. Fix #1407
  ...

# Conflicts:
#	components/prism-kotlin.js
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.

1 participant