Ptolemy 760c6a996a SL-14705: Fix merge conflict		2021-01-25 15:53:43 -08:00
..
LGPL-licence.txt	…
LICENSE-logos.txt	…
LICENSE-source.txt	…
contributions.txt	SL-14705: Fix merge conflict	2021-01-25 15:53:43 -08:00
releasenotes-where.txt	…
translations.txt	…