Merge branch 'master' into ticket/17118 · sagemath/sagetrac-mirror@e7a9d14 · GitHub

This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Merge branch 'master' into ticket/17118

Browse files

Conflicts:
	src/sage/schemes/affine/affine_morphism.py

Loading branch information

Grayson Jorgenson committed Oct 16, 2014

2 parents 2cc284a + 36c150e commit e7a9d14