From: coquand <coquand@chalmers.se>
Date: Fri, 3 Jul 2015 11:16:12 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/mortberg/cubicaltt
X-Git-Url: https://git.ak3n.com/?a=commitdiff_plain;h=d9a32930eff979e763bf85a635d0e47025c343c6;p=cubicaltt.git

Merge branch 'master' of https://github.com/mortberg/cubicaltt

Conflicts:
	examples/univalence.ctt
---

d9a32930eff979e763bf85a635d0e47025c343c6