Oswaldo Acauan afe1a66e02 Fix conflicts and merge master		2016-07-28 19:50:44 +00:00
..
client	Add handlers for kick	2016-07-28 19:48:26 +00:00
server	add httpS flag in config instead of detecting prod vs dev env	2016-07-27 16:36:33 +00:00