Merge branch 'rebase-fix' into 'master'
[embedlite-components] Fix Gecko38 rebase errors This aligns content between nemo_embedlite_38 and master branches. Noticed that "embedui:addhistory" got duplicated in embedhelper.js and noticed small glitches in UserAgentOverrideHelper. Noticed errors right after merging MR: https://git.merproject.org/mer-core/embedlite-components/merge_requests/20 See merge request !21
Showing with 22 additions and 37 deletions