Merge branch 'develop' into gameworlds-and-gamemodes

Browse Source

Conflicts:
	src/main/java/world/bentobox/bentobox/managers/SchemsManager.java

...

This commit is contained in:

tastybento 2018-12-24 20:24:22 -08:00

parent 17c087469b b82f59e948

commit 08ac89e510

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available