Skip to content

Commit

Permalink
Merge PR #1499 into 13.0
Browse files Browse the repository at this point in the history
Signed-off-by Yajo
  • Loading branch information
OCA-git-bot committed Jan 30, 2020
2 parents 53135aa + 77b09d5 commit 2039d74
Show file tree
Hide file tree
Showing 42 changed files with 948 additions and 893 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Expand Up @@ -7,11 +7,11 @@ indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[.eslintrc,*.{json,yml,yaml,rst,md}]
[*.{json,yml,yaml,rst,md}]
indent_size = 2

# Do not configure editor for libs and autogenerated content
[*/static/{lib,src/lib}/**,*/static/description/index.html,*/readme/../README.rst]
[{*/static/{lib,src/lib}/**,*/static/description/index.html,*/readme/../README.rst}]
charset = unset
end_of_line = unset
indent_size = unset
Expand Down
291 changes: 0 additions & 291 deletions .eslintrc

This file was deleted.

0 comments on commit 2039d74

Please sign in to comment.