Merge pull request #106 from RussTheAerialist/prep-for-0-5

Russell Hay · web-flow · commit a426a421b3a5 · 2016-11-01T14:45:38.000-07:00
Prep for 0 5
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 05 (01 November 2016)
+
+* Added ability to set the port for connections (#97)
+* Added ability to read and write caption for datasources (#99)
+* Added documentation
+
 ## 0.4 (07 October 2016)
 
 * Add ability to remove repository location (#86)
diff --git a/docs/docs/dev-guide.md b/docs/docs/dev-guide.md
@@ -3,6 +3,7 @@ title: Developer Guide
 layout: docs
 ---
 
+<<<<<<< 6ee666bf06d5ab59931100b3955779c35693e33f
 ## Submitting your first patch
 
 1. Make sure you have [signed the CLA](http://tableau.github.io/#contributor-license-agreement-cla)
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='tableaudocumentapi',
-    version='0.5.dev0',
+    version='0.5',
     author='Tableau',
     author_email='github@tableau.com',
     url='https://github.com/tableau/document-api-python',
