Merge branch 'master' into ATS-175

# Conflicts:
#	alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickController.java
#	pom.xml
This commit is contained in:
Cezar.Leahu 2018-10-29 17:39:35 +02:00
commit 2842cafbd9

View File

@ -131,6 +131,15 @@
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>