Merge pull request #36240 from womfoo/fix-bump/conkeror-1.0.4
conkeror: use firefox-esr, 1.0.3 -> 1.0.4
authored by Jörg Thalheim and committed by GitHub 8 years ago ee735ff1 ab59aa73