unison/unison-core
Arya Irani 5ded801392 Merge remote-tracking branch 'origin/topic/rehash-codebase' into topic/rehash-codebase-reexport-hash
# Conflicts:
#	parser-typechecker/src/Unison/Codebase/Branch.hs
#	parser-typechecker/src/Unison/Hashing/V2/Convert.hs
2021-12-03 11:33:15 -10:00
..
src/Unison Merge remote-tracking branch 'origin/topic/rehash-codebase' into topic/rehash-codebase-reexport-hash 2021-12-03 11:33:15 -10:00
LICENSE Update and standardize licenses 2021-10-12 13:47:08 -06:00
package.yaml Merge remote-tracking branch 'origin/trunk' into topic/rehash-codebase 2021-11-11 23:22:09 -05:00
unison-core1.cabal Merge branch 'trunk' into topic/rehash-codebase 2021-11-29 16:48:09 -06:00