ARMORY-120 P2SH/Lockbox ID features stopped working
Fixed
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel