mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-10-01 11:49:04 +00:00
# Conflicts: # framework-docs/modules/ROOT/pages/data-access/orm/hibernate.adoc # spring-orm/src/main/java/org/springframework/orm/hibernate5/package-info.java # spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java # spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java