Commit b3e28997 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 00be2e06 f19e1ce7

beedk-acs-module-tile/tile.xml

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
					<execution>

						<id>acs-module-version</id>

						<phase>initialize</phase>

						<goals><goal>match-text</goal></goals>

						<goals><goal>replace-text</goal></goals>

						<configuration>

							<text>${project.version}</text>

							<newProperty>project.moduleVersion</newProperty>
@@ -246,7 +246,7 @@ 
			<plugin>

				<groupId>com.inteligr8.alfresco</groupId>

				<artifactId>amp-maven-plugin</artifactId>

				<version>1.1.1</version>

				<version>1.1.2</version>

				<executions>

					<execution>

						<id>build-amp-file</id>