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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Address the move from module_files.mimetype to files.media_type #117

Merged
merged 1 commit into from
Feb 18, 2016
Merged

Address the move from module_files.mimetype to files.media_type #117

merged 1 commit into from
Feb 18, 2016

Conversation

mmulich
Copy link
Contributor

@mmulich mmulich commented Feb 3, 2016

This change was created to respond to the changes found in openstax/cnx-archive#403.

Drop the last commit prefixed 馃拃 before you merge. It was created to make sure travis tests pass against the related branch in cnx-archive.

@reedstrm
Copy link
Contributor

rolled back via:

git checkout mimetype-shuffle
git reset --hard 7a876f8e457d4480039c2fe7ca6dc88d3e98c752
git push -f origin

reedstrm added a commit that referenced this pull request Feb 18, 2016
@reedstrm
Merge pull request #117 from Connexions/mimetype-shuffle
4efab55 
Address the move from module_files.mimetype to files.media_type
@reedstrm reedstrm merged commit 4efab55 into master Feb 18, 2016
@reedstrm reedstrm deleted the mimetype-shuffle branch February 18, 2016 22:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@mmulich @reedstrm