20:20:48 {u/jj/theta_group} /usr/local/src/trac$ git merge --no-commit u/mraum/ticket/16883
Updating e8df685..87df16c
Fast-forward
 src/sage/modular/modform_hecketriangle/abstract_ring.py         |  90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
 src/sage/modular/modform_hecketriangle/abstract_space.py        | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
 src/sage/modular/modform_hecketriangle/element.py               |   4 +++-
 src/sage/modular/modform_hecketriangle/graded_ring_element.py   |  23 ++++++++++++++++-------
 src/sage/modular/modform_hecketriangle/hecke_triangle_groups.py |   1 +
 src/sage/modular/modform_hecketriangle/series_constructor.py    |  39 +++++++++++++++++++++++++++++----------
 6 files changed, 171 insertions(+), 97 deletions(-)