Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Thymeleaf i18n resolved #1016

Merged
merged 6 commits into from
Jan 19, 2017
Merged

Thymeleaf i18n resolved #1016

merged 6 commits into from
Jan 19, 2017

Conversation

maibin
Copy link
Collaborator

@maibin maibin commented Jan 19, 2017

No description provided.

maibin added 6 commits January 5, 2017 23:02
Conflicts:
	spring-thymeleaf/pom.xml
	spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java
	spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/DatesController.java
	spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/ExpressionUtilityObjectsControllerIntegrationTest.java
Conflicts:
	spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java
@maibin maibin merged commit a9a3f3b into eugenp:master Jan 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant