Commit a2cfbaef authored by Robert Hitt's avatar Robert Hitt

Merge branch 'master' into 'issue#61'

# Conflicts:
#   go/go/templates/link_box.html
parents a1eb1914 ac444542
Pipeline #397 passed with stage
in 3 minutes and 33 seconds