Merge branch 'import-from-url'

This commit is contained in:
Boris Berenberg
2018-08-21 12:12:07 -04:00
4 changed files with 208 additions and 8 deletions

View File

@@ -15,7 +15,7 @@
<url>http://www.atlassian.com/</url>
</organization>
<name>confluence-markdown-macro</name>
<description>This plugin provides a Markdown render macro for Confluence.</description>
<description>This plugin provides macros to render markdown for Confluence.</description>
<packaging>atlassian-plugin</packaging>
<dependencies>
<dependency>
@@ -90,6 +90,8 @@
<configuration>
<productVersion>${confluence.version}</productVersion>
<productDataVersion>${confluence.data.version}</productDataVersion>
<enableQuickReload>true</enableQuickReload>
<enableFastdev>false</enableFastdev>
</configuration>
</plugin>
<plugin>
@@ -104,7 +106,7 @@
<properties>
<confluence.version>6.9.0</confluence.version>
<confluence.data.version>6.9.0</confluence.data.version>
<amps.version>6.2.11</amps.version>
<amps.version>6.3.0</amps.version>
<plugin.testrunner.version>1.1</plugin.testrunner.version>
<atlassian.spring.scanner.version>2.1.7</atlassian.spring.scanner.version>
</properties>