Phil Ringnalda 9c92a69a82 Merge autoland to m-c, a=merge		2016-10-01 14:00:21 -07:00
..
locales	Bug 1298872 - Fix text cropped and overflowed in advanced pane in-content dialogs; r=MattN	2016-09-05 18:11:08 +08:00
pki	Bug 1049001 - Convert the certManager dialog to in-content; r=MattN	2016-09-13 14:27:13 -07:00
ssl	Merge autoland to m-c, a=merge	2016-10-01 14:00:21 -07:00
tools	merge mozilla-inbound to mozilla-central a=merge	2016-09-08 12:01:17 +02:00
.eslintrc.json	Bug 1284438 - Enable more ESLint rules for PSM. r=mgoodwin	2016-07-06 01:59:03 +08:00
android_stub.h	Bug 1288644 - Don't define RTLD_NOLOAD when __ANDROID_API__ >= 21. r=glandium	2016-07-22 16:40:21 +09:00
moz.build	Bug 1286877 - do not set c-basic-offset for python-mode; r=gps	2016-07-14 10:16:42 -06:00