From 426e0bbeac0a9e66033b9e579e06f7762c91ec7a Mon Sep 17 00:00:00 2001
From: Gaston Dombiak <gdombiak@gmail.com>
Date: Sun, 19 Aug 2018 14:36:42 -0700
Subject: [PATCH] Getting ready to release 1.5

---
 CHANGELOG.md       | 22 +++++++++++++++++++++-
 OctoPod/Info.plist |  4 ++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13f80641..951d1245 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Change Log
 
+## [1.5](https://github.com/gdombiak/OctoPod/tree/1.5) (2018-08-19)
+[Full Changelog](https://github.com/gdombiak/OctoPod/compare/1.4...1.5)
+
+**Implemented enhancements:**
+
+- Add visual indication which printer is active in list of printers [\#50](https://github.com/gdombiak/OctoPod/issues/50)
+- Support TPLink Smartplug to power printer on/off [\#49](https://github.com/gdombiak/OctoPod/issues/49)
+- Add graph that shows temp history [\#48](https://github.com/gdombiak/OctoPod/issues/48)
+- Add support for multiple cameras [\#47](https://github.com/gdombiak/OctoPod/issues/47)
+- Make it explicit that webcam image supports full screen and zoom in/out [\#46](https://github.com/gdombiak/OctoPod/issues/46)
+- Feature request: PSU Control plugin support. [\#36](https://github.com/gdombiak/OctoPod/issues/36)
+
+**Fixed bugs:**
+
+- Webcam full screen has white borders on iPhone X [\#52](https://github.com/gdombiak/OctoPod/issues/52)
+
+**Closed issues:**
+
+- Not very clear that wrench icons indicate that temps can be set [\#18](https://github.com/gdombiak/OctoPod/issues/18)
+
 ## [1.4](https://github.com/gdombiak/OctoPod/tree/1.4) (2018-08-05)
 [Full Changelog](https://github.com/gdombiak/OctoPod/compare/1.3...1.4)
 
@@ -85,4 +105,4 @@
 ## [1.0](https://github.com/gdombiak/OctoPod/tree/1.0) (2018-07-15)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/OctoPod/Info.plist b/OctoPod/Info.plist
index e1cd5626..830b94a7 100644
--- a/OctoPod/Info.plist
+++ b/OctoPod/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4</string>
+	<string>1.5</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>