Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-09-29 04:27:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
e53c53bb4a
PlotSquared/Core
History
dordsor21 e53c53bb4a
Merge branch 'v6' into feature/v6/pipeline-queue 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
#	Core/src/main/java/com/plotsquared/core/queue/BasicLocalBlockQueue.java
2020-07-24 12:21:40 +01:00
..
src Merge branch 'v6' into feature/v6/pipeline-queue 2020-07-24 12:21:40 +01:00
build.gradle Fix dependencies 2020-07-23 15:03:57 +02:00
pom.xml Merge branch 'v6' into feature/v6/pipeline-queue 2020-07-24 12:21:40 +01:00