]> matita.cs.unibo.it Git - helm.git/commitdiff
Merge branch 'master' of ssh://matita.cs.unibo.it:/srv/git/helm
authorFerruccio Guidi <ferruccio.guidi@unibo.it>
Mon, 11 Jun 2018 21:36:41 +0000 (23:36 +0200)
committerFerruccio Guidi <ferruccio.guidi@unibo.it>
Mon, 11 Jun 2018 21:36:41 +0000 (23:36 +0200)
# Conflicts:
# matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl


Trivial merge