diff options
| author | snowleo <schneeleo@gmail.com> | 2011-10-22 11:55:01 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-10-22 11:55:01 +0200 |
| commit | 11e8240c5cbadca9cf9d0a69c97e99220f808e69 (patch) | |
| tree | 6912ca173e596e91757788825e1ae7c555a07c8d /EssentialsXMPP/src/config.yml | |
| parent | 4aecc034c26d6d9c71024f90183e25e431217b7b (diff) | |
| parent | aa922c5b67dc6d9fc5ef865edb9269397a687e13 (diff) | |
| download | Essentials-stable-2.6.4.tar Essentials-stable-2.6.4.tar.gz Essentials-stable-2.6.4.tar.lz Essentials-stable-2.6.4.tar.xz Essentials-stable-2.6.4.zip | |
Merge branch 'refs/heads/master' into releasestable-2.6.4
Conflicts:
EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
Diffstat (limited to 'EssentialsXMPP/src/config.yml')
0 files changed, 0 insertions, 0 deletions