Skip to content

Commit 136caa3

Browse files
committed
Merge branch '2.6'
Conflicts: release-notes/VERSION
2 parents 19b3c27 + d245a61 commit 136caa3

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

release-notes/VERSION

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ No changes since 2.7.0
2424
#81: Hibernate4Module causes Type Erasure
2525
(reported by agorina@github)
2626

27-
2.6.5 (not yet released)
27+
2.6.6 (05-Apr-2016)
28+
29+
No changes since 2.6.5
30+
31+
2.6.5 (19-Jan-2016)
2832

2933
#70: Infinite recursion due to `@JsonIgnoreProperties` not passed to property
3034
(reported, fix contributed by Tiago P)

0 commit comments

Comments
 (0)