Merge branch 'master' into vplyashkun/inplace_rename_lags

GitOrigin-RevId: 5c7f8c478e7328df1646879ede977efd7465adf8
This commit is contained in:
Vladimir Plyashkun
2019-05-03 01:38:45 +03:00
committed by intellij-monorepo-bot
parent e3ca319824
commit d990d75dba
799 changed files with 10472 additions and 8013 deletions
@@ -94,11 +94,11 @@
"if_brace_force": "never",
"imports_layout": [
"*",
"blank_line",
"|",
"javax.**",
"java.**",
"blank_line",
"static *"
"|",
"$*"
],
"indent_case_from_switch": true,
"indent_size": 4,