Changed mediaType to match cnx
Merge branch 'bookish-only' into epub-only
CHanged mediaType to match cnx
Merge branch 'epub-only' into dev