Added linein preset keyword - json now supports "linein":"room_name"#100

Open

LqqkOut wants to merge 4 commits intojishi:masterfrom

LqqkOut:line_in_preset

Commits on Feb 21, 2017

Added linein preset keyword - json now supports "linein":"room_name"
LqqkOut
committed

Commits on Feb 22, 2017