Merge remote-tracking branch 'upstream/master' into mergeback-20181112

This commit is contained in:
Jonas Jensen
2018-11-12 13:24:27 +01:00
38 changed files with 700 additions and 54 deletions

6
java/ql/test/format.json Normal file
View File

@@ -0,0 +1,6 @@
[
{
"pattern": "**/*.java",
"allowMixedTabsAndSpaces": true
}
]