Merge branch 'groupmanager' of

Browse Source

https://ElgarL@github.com/essentials/Essentials.git into groupmanager

Conflicts:
	EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java

...

This commit is contained in:

ElgarL 2012-07-10 14:27:50 +01:00

parent ce1e92389f 0da3bc3dd6

commit 4acce8bfab

1 changed files with 3 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files