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 Haxe #811

Merged
merged 3 commits into from
Oct 21, 2015
Merged

Add support for Haxe #811

merged 3 commits into from
Oct 21, 2015

Conversation

Golmote
Copy link
Contributor

@Golmote Golmote commented Oct 15, 2015

prism-haxe

Conflicts:
	plugins/autoloader/prism-autoloader.js
	plugins/autoloader/prism-autoloader.min.js
Golmote added a commit that referenced this pull request Oct 21, 2015
@Golmote Golmote merged commit bd44341 into PrismJS:gh-pages Oct 21, 2015
@Golmote Golmote deleted the prism-haxe branch October 21, 2015 04:35
@hamaluik
Copy link

Uhh.. shouldn't this have been merged to master instead of gh-pages??

@Golmote
Copy link
Contributor Author

Golmote commented Oct 25, 2015

No. Everything is first merged into gh-pages. gh-pages is merged into master when we release a new version. I'll try to do it soon. Hopefully this week.

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