diff options
| author | ElgarL <ElgarL@palmergames.com> | 2012-07-10 14:27:50 +0100 |
|---|---|---|
| committer | ElgarL <ElgarL@palmergames.com> | 2012-07-10 14:27:50 +0100 |
| commit | dfaa1db76f969efdc8897cb5709982250815bdaa (patch) | |
| tree | c89d9112eccc4cc7bade18c2f80c103c5160c728 /EssentialsGroupManager/src/Changelog.txt | |
| parent | 2ecddaa46e96a35b5c40db6dcf3a10e88decc43b (diff) | |
| parent | 6503e49d4d8e3c20bec200953cd9983fa3e62686 (diff) | |
| download | Essentials-dfaa1db76f969efdc8897cb5709982250815bdaa.tar Essentials-dfaa1db76f969efdc8897cb5709982250815bdaa.tar.gz Essentials-dfaa1db76f969efdc8897cb5709982250815bdaa.tar.lz Essentials-dfaa1db76f969efdc8897cb5709982250815bdaa.tar.xz Essentials-dfaa1db76f969efdc8897cb5709982250815bdaa.zip | |
Merge branch 'groupmanager' of
https://ElgarL@github.com/essentials/Essentials.git into groupmanager
Conflicts:
EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
Diffstat (limited to 'EssentialsGroupManager/src/Changelog.txt')
0 files changed, 0 insertions, 0 deletions