diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-01-24 22:56:53 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-01-24 22:56:53 +0000 |
| commit | 38a932728466a28d773a348f47db59028b5fe8b4 (patch) | |
| tree | f68e03d8421f2ccced735bef3ed188aaf3e5c317 /EssentialsXMPP | |
| parent | bdc695c85b97a31694c75716f33566b171a9559f (diff) | |
| parent | 307c6c7bf0465a741034786686806a9b094df4a1 (diff) | |
| download | Essentials-38a932728466a28d773a348f47db59028b5fe8b4.tar Essentials-38a932728466a28d773a348f47db59028b5fe8b4.tar.gz Essentials-38a932728466a28d773a348f47db59028b5fe8b4.tar.lz Essentials-38a932728466a28d773a348f47db59028b5fe8b4.tar.xz Essentials-38a932728466a28d773a348f47db59028b5fe8b4.zip | |
Merge branch '3.0' of github.com:essentials/Essentials into 3.0
Conflicts:
Essentials/src/messages_en.properties
Diffstat (limited to 'EssentialsXMPP')
0 files changed, 0 insertions, 0 deletions