commit f3e479d86a4ef945279b6a2df4e997ad8a935b0a Merge: 5cf384c 92aa427 Author: Nicolas Vigier boklm@torproject.org Date: Mon Jun 4 14:21:09 2018 +0200

Merge remote-tracking branch 'gk/bug_26003'

projects/firefox/mozconfig-osx-x86_64 | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)