mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2024-08-21 10:52:01 +00:00
Merge branch 'groupmanager' of
https://ElgarL@github.com/essentials/Essentials.git into groupmanager Conflicts: EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
This commit is contained in:
commit
8fac5f6beb