4 Commits

Author	SHA1	Message	Date
Troy Frew	59f69a69c5	Upstream Merge	2016-10-30 10:46:05 -04:00
Troy Frew	a1e3ee4799	Updated upstream. Moved our Disconnection patches to the fire-pit as there is some duplicate features from BungeeCord provided now.	2016-10-25 12:57:11 -04:00
Jamie Mansfield	ea1d5fd3a6	Remove duplicate dependency	2016-08-30 22:30:01 +01:00
Jamie Mansfield	1d27a880c3	Update upstream ... upstream finnaly caught up on those netty versions :D	2016-08-30 18:30:38 +01:00