| commit | 3f53c23e1087b6e4c0983858cdd132633272ec25 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Mon Nov 12 02:36:03 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Nov 12 02:36:03 2018 +0000 |
| tree | 52a2dec1c03b901fb9a86f69afe4ebb59da8966e | |
| parent | 5823b8ec32719a2bc24496a2b216b7d95524b04a [diff] | |
| parent | e3295195b9fce06b4bf95fe3fc89c2fd665a1fc7 [diff] |
Merge "Merge branch 'stable-2.15' into stable-2.16" into stable-2.16
diff --git a/.gitignore b/.gitignore index e544356..319b3cf 100644 --- a/.gitignore +++ b/.gitignore
@@ -31,3 +31,4 @@ /test_site /tools/format /.vscode +/.ijwb