Shaun Bennett 15f3b19f8a Merge remote-tracking branch 'origin/update/uhc-moppletop' into update/uhc-moppletop ... * origin/update/uhc-moppletop: Retry CTF proxy fix Eternal Giveaway Fixes Eternal giveaway refactoring Revert: Disable Fated giveaway tools for now Eternal Rank # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java		2016-11-23 18:11:26 -05:00
..
src	Merge remote-tracking branch 'origin/update/uhc-moppletop' into update/uhc-moppletop	2016-11-23 18:11:26 -05:00
ascii.png	Fix ascii.png duplication.	2016-01-21 17:47:21 +11:00
pom.xml	Remove googles http api (no longer needed) and add apache http to core.common	2016-05-24 17:23:17 +10:00