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

Update to listing of companies that rely on DITA-OT #29

Closed
wants to merge 3 commits into from

Conversation

keberlein
Copy link
Contributor

Add Vasont CMS
Break (increasingly lengthy) list into categories: Authoring tools, content management systems, delivery systems, print

@keberlein keberlein added the vendors Updates to third-party software listings label Nov 30, 2016
@jelovirt
Copy link
Member

@keberlein Look at https://github.com/dita-ot/dita-ot.github.io/pull/29/commits, the PR still contains the old PR's commit and the merge commit. The problem is that update branch has been branched of from your master branch, not dita-ot.github.io repo's master branch.

This PR should not be merged as is. Instead, cherry pick 100da4d and close the PR without merging.

@keberlein
Copy link
Contributor Author

Thank you for the explanation and help. I'll straighten this out.

@keberlein keberlein deleted the update branch December 1, 2016 16:02
@infotexture
Copy link
Member

Superseded by #30.

@infotexture infotexture added the invalid This doesn't seem right label Dec 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
invalid This doesn't seem right vendors Updates to third-party software listings
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants