Skip to content

Commit

Permalink
Merge branch 'main' into open-modules
Browse files Browse the repository at this point in the history
  • Loading branch information
tisonkun authored Jun 6, 2022
2 parents 3cc5626 + 2a0f65a commit 497a15c
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 25 deletions.
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ This document is intended for Spotless developers.
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).

## [Unreleased]

## [2.26.0] - 2022-06-05
### Added
* Support for `editorConfigOverride` in `ktlint`. ([#1218](https://github.com/diffplug/spotless/pull/1218) fixes [#1193](https://github.com/diffplug/spotless/issues/1193))
### Fixed
Expand Down
2 changes: 2 additions & 0 deletions plugin-gradle/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).

## [Unreleased]

## [6.7.0] - 2022-06-05
### Added
* Support for `editorConfigOverride` in `ktlint`. ([#1218](https://github.com/diffplug/spotless/pull/1218) fixes [#1193](https://github.com/diffplug/spotless/issues/1193))
* If you are using properties like `indent_size`, you should pass now pass them as `editorConfigOverride` and not as `userData`.
Expand Down
Loading

0 comments on commit 497a15c

Please sign in to comment.