mirror of
https://github.com/EssentialsX/Essentials.git
synced 2024-09-06 13:08:04 +02:00
Merge branch 'groupmanager' Conflicts: EssentialsGroupManager/src/plugin.yml EssentialsGroupManager/src/users.yml |
||
---|---|---|
.. | ||
nbproject | ||
src | ||
.classpath | ||
.project | ||
build.xml |