Merge branch '1.2.x'
This commit is contained in:
		
						commit
						c3328721a1
					
				| 
						 | 
					@ -148,7 +148,7 @@
 | 
				
			||||||
		<spring-social-facebook.version>2.0.3.RELEASE</spring-social-facebook.version>
 | 
							<spring-social-facebook.version>2.0.3.RELEASE</spring-social-facebook.version>
 | 
				
			||||||
		<spring-social-linkedin.version>1.0.2.RELEASE</spring-social-linkedin.version>
 | 
							<spring-social-linkedin.version>1.0.2.RELEASE</spring-social-linkedin.version>
 | 
				
			||||||
		<spring-social-twitter.version>1.1.2.RELEASE</spring-social-twitter.version>
 | 
							<spring-social-twitter.version>1.1.2.RELEASE</spring-social-twitter.version>
 | 
				
			||||||
		<spring-ws.version>2.2.3.RELEASE</spring-ws.version>
 | 
							<spring-ws.version>2.2.5.BUILD-SNAPSHOT</spring-ws.version>
 | 
				
			||||||
		<statsd-client.version>3.1.0</statsd-client.version>
 | 
							<statsd-client.version>3.1.0</statsd-client.version>
 | 
				
			||||||
		<sun-mail.version>${javax-mail.version}</sun-mail.version>
 | 
							<sun-mail.version>${javax-mail.version}</sun-mail.version>
 | 
				
			||||||
		<thymeleaf.version>2.1.4.RELEASE</thymeleaf.version>
 | 
							<thymeleaf.version>2.1.4.RELEASE</thymeleaf.version>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue