diff --git a/.editorconfig b/.editorconfig index ce04bc2e72..0f1786729b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,9 +3,7 @@ root = true [*] charset = utf-8 end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace = true - -[*.sh] indent_size = 2 indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/README.md b/README.md index 7e60ad11d2..2c5766ff40 100644 --- a/README.md +++ b/README.md @@ -268,15 +268,15 @@ about the expectations for all contributors to this project. ## Docker Working Group Members - * Christopher Horrell ([chorrell](https://github.com/chorrell)) - * Hans Kristian Flaatten ([starefossen](https://github.com/starefossen)) - * Hugues Malphettes ([hmalphettes](https://github.com/hmalphettes)) - * John Mitchell ([jlmitch5](https://github.com/jlmitch5)) - * Peter Petrov ([pesho](https://github.com/pesho)) + * Christopher Horrell ([chorrell](https://github.com/chorrell)) + * Hans Kristian Flaatten ([starefossen](https://github.com/starefossen)) + * Hugues Malphettes ([hmalphettes](https://github.com/hmalphettes)) + * John Mitchell ([jlmitch5](https://github.com/jlmitch5)) + * Peter Petrov ([pesho](https://github.com/pesho)) ## Docker Working Group Collaborators - * Mikeal Rogers ([mikeal](https://github.com/mikeal)) - * Laurent Goderre ([LaurentGoderre](https://github.com/LaurentGoderre)) - * Simen Bekkhus ([SimenB](https://github.com/SimenB)) - * Peter Dave Hello ([PeterDaveHello](https://github.com/PeterDaveHello)) + * Mikeal Rogers ([mikeal](https://github.com/mikeal)) + * Laurent Goderre ([LaurentGoderre](https://github.com/LaurentGoderre)) + * Simen Bekkhus ([SimenB](https://github.com/SimenB)) + * Peter Dave Hello ([PeterDaveHello](https://github.com/PeterDaveHello))