Merge branch 'master' into v1.2.1

sharif26 · web-flow · commit 07f6de757b88 · 2017-08-28T12:53:42.000-04:00
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/
+
