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

Merge xdmod6.6 into xdmod6.7 (#96, #123, #130, #132, #135, #140) #141

Merged
merged 15 commits into from
May 12, 2017

Conversation

jtpalmer
Copy link
Contributor

Description

Merges xdmod6.6 into xdmod6.7.

Conflicts:

  • html/about/publications.html

@jtpalmer jtpalmer added this to the v6.7.0 milestone May 11, 2017
@jsperhac jsperhac merged commit 6fc2c89 into ubccr:xdmod6.7 May 12, 2017
@jtpalmer jtpalmer deleted the xdmod6.7-sync-xdmod6.6 branch May 15, 2017 13:48
@tyearke tyearke modified the milestones: v7.0.0, v6.7.0 Jun 6, 2017
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.

5 participants