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 a46497255e efec7c8f95

commit 8fac5f6beb

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

Download patch file Download diff file Expand all files Collapse all files