Skip to content

Commit

Permalink
Merge branch '2.2.x' into 2.3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
philwebb committed Jun 8, 2020
2 parents 8cd0f56 + ee00b57 commit e9e4a34
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
.#*
.*.md.html
.DS_Store
.attach_pid*
.classpath
.factorypath
.gradle
Expand Down

0 comments on commit e9e4a34

Please sign in to comment.