Merge branch 'master' into 1.16

This commit is contained in:
gnembon committed 2020-07-13 00:41:34 -03:00
commit 0e21942df7
13 files changed
+623 -556

No files matched your search

@@ -65,5 +65,4 @@ public interface CarpetExtension
default Map<String, String> canHasTranslations(String lang) { return null;}
}