Commit Graph

2 Commits

Author SHA1 Message Date
Chiss
d1be64d7e7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
2014-12-15 14:56:09 +11:00
CoderTim
f5f9ba6bdf Added .project and .classpath for Mineplex.Database 2014-09-11 17:10:24 -04:00