From: Ferruccio Guidi <ferruccio.guidi@unibo.it>
Date: Mon, 11 Jun 2018 21:36:41 +0000 (+0200)
Subject: Merge branch 'master' of ssh://matita.cs.unibo.it:/srv/git/helm
X-Git-Tag: make_still_working~305
X-Git-Url: http://matita.cs.unibo.it/gitweb/?p=helm.git;a=commitdiff_plain;h=730642efca3fb00ca4f8268bd97b0778cff14514

Merge branch 'master' of ssh://matita.cs.unibo.it:/srv/git/helm

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

730642efca3fb00ca4f8268bd97b0778cff14514