]> matita.cs.unibo.it Git - helm.git/commit
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)
commit730642efca3fb00ca4f8268bd97b0778cff14514
treed8cfb6da1ffcb75030c8cfdb3d749a539dbef265
parentc2a67c225e01fc11b1ca479f45a159df2890bd8d
parentbb246930370226dc96c9b9121f59853a0a2f1434
Merge branch 'master' of ssh://matita.cs.unibo.it:/srv/git/helm

# Conflicts:
# matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl