Merge branch 'develop' into release/2.17.0

salesforce · Jul 31, 2018 · a3927a5 · a3927a5
2 parents d8ba53a + cd714df
commit a3927a5
Show file tree

Hide file tree

Showing 28 changed files with 2,069 additions and 338 deletions.
diff --git a/ArgusClient/pom.xml b/ArgusClient/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>argus</artifactId>
         <groupId>com.salesforce.argus</groupId>
-        <version>2.17.1</version>
+        <version>2.17.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>argus-client</artifactId>

diff --git a/ArgusCore/pom.xml b/ArgusCore/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>argus</artifactId>
         <groupId>com.salesforce.argus</groupId>
-        <version>2.17.1</version>
+        <version>2.17.0</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>argus-core</artifactId>