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 issue 392 (Move oXygen documentation from build.xml to Wiki) #471

Merged
merged 942 commits into from
May 25, 2019

Conversation

AirQuick
Copy link
Member

This pull request derives from #470. So needs to be handled after that.


Fixes #392

Just updates <description>. No substantial change.

…nt-family

# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/xspec.bats
…-folding-img-src

# Conflicts:
#	.gitignore
#	.travis.yml
#	appveyor.yml
#	test/.gitignore
#	test/end-to-end/README.md
#	test/end-to-end/cases/expected/stylesheet/coverage-tutorial-result.html
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/processor/html/_normalizer.xsl
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
#	test/run-bats.cmd
#	test/run-bats.sh
#	test/win-bats/collection.xml
#	test/xspec.bats
…-cmdline

# Conflicts:
#	.travis.yml
#	appveyor.yml
This reverts commit bff83d3.
@AirQuick AirQuick added this to the v1.4.0 milestone Apr 30, 2019
@AirQuick AirQuick merged commit 649a65b into xspec:master May 25, 2019
@AirQuick AirQuick deleted the fix_issue-392 branch May 25, 2019 06:38
@AirQuick
Copy link
Member Author

@cirulls
Merged this simplification of comment.

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.

Move oXygen documentation from build.xml to Wiki
1 participant