]> git.lizzy.rs Git - torbrowser-launcher.git/commitdiff
Merge branch 'intrigeri-apparmor-e10s' into apparmor
authorMicah Lee <micah@micahflee.com>
Sun, 28 Jan 2018 17:09:38 +0000 (09:09 -0800)
committerMicah Lee <micah@micahflee.com>
Sun, 28 Jan 2018 17:09:38 +0000 (09:09 -0800)

Trivial merge