mirror of
https://github.com/EssentialsX/Essentials.git
synced 2024-12-27 03:28:30 +01:00
1df79bc9f4
Merge branch 'groupmanager' Conflicts: EssentialsGroupManager/src/plugin.yml EssentialsGroupManager/src/users.yml |
||
---|---|---|
.. | ||
nbproject | ||
src | ||
.classpath | ||
.project | ||
build.xml |