Commit Graph

4 Commits

Author SHA1 Message Date
Keir
67b3fe1d23 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-12-07 18:11:40 +00:00
Keir
eed944597c Commit PHP code. 2015-12-07 17:05:58 +00:00
Keir
e21bd37b92 Add connection host for Jedis. 2015-12-06 19:05:20 +00:00
Keir
ddf6037fc4 Wrote standalone chatsnap handler and implemented required changes in Core. 2015-12-04 23:30:27 +00:00