Merge branch 'master' into v1.2.1

salesforce-marketingcloud · Aug 28, 2017 · 07f6de7 · 07f6de7
2 parents be4ae03 + 1a92f50
commit 07f6de7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 # OS X
 .DS_Store
 fuelsdk.properties
+settings.xml
 
 # Eclipse
 .classpath

diff --git a/changelog.md b/changelog.md
@@ -25,4 +25,6 @@
      - ETSubscriberTest.java
      - ETTriggeredTest.java
 
-* API docs : added API documentation using doxygen documentation framework. (under docs/ directory)
+* API docs : added API documentation using javadoc documentation framework. (under docs/ directory)
+http://salesforce-marketingcloud.github.io/FuelSDK-Java/
+