From 73637273dc4a703e796d9b5f3230f945a0345e0a Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 21 Aug 2018 20:24:35 +0200
Subject: [PATCH 1/2] Fixed broken frontend

---
 changes/changelog.d/instance-url.bugfix | 1 +
 front/src/App.vue                       | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 changes/changelog.d/instance-url.bugfix

diff --git a/changes/changelog.d/instance-url.bugfix b/changes/changelog.d/instance-url.bugfix
new file mode 100644
index 000000000..356aa12a5
--- /dev/null
+++ b/changes/changelog.d/instance-url.bugfix
@@ -0,0 +1 @@
+Fixed front-end not contacting the proper path on the API
diff --git a/front/src/App.vue b/front/src/App.vue
index c8134a4a0..0bfdeb8b2 100644
--- a/front/src/App.vue
+++ b/front/src/App.vue
@@ -127,6 +127,9 @@ export default {
     if (!this.$store.state.instance.instanceUrl) {
       let defaultInstanceUrl = process.env.VUE_APP_INSTANCE_URL || this.$store.getters['instance/defaultUrl']()
       this.$store.commit('instance/instanceUrl', defaultInstanceUrl)
+    } else {
+      // needed to trigger initialization of axios
+      this.$store.commit('instance/instanceUrl', this.$store.state.instance.instanceUrl)
     }
     this.$store.dispatch('auth/check')
     this.$store.dispatch('instance/fetchSettings')

From 9875e81c76df1bd5ce313785f2d3d6716d4e5847 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Tue, 21 Aug 2018 20:34:06 +0200
Subject: [PATCH 2/2] Version bump and changelog for 0.16.3

---
 CHANGELOG                               | 16 ++++++++++++++++
 api/funkwhale_api/__init__.py           |  2 +-
 changes/changelog.d/instance-url.bugfix |  1 -
 3 files changed, 17 insertions(+), 2 deletions(-)
 delete mode 100644 changes/changelog.d/instance-url.bugfix

diff --git a/CHANGELOG b/CHANGELOG
index 7fcaceaf4..007671930 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,9 +10,25 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+0.16.3 (2018-08-21)
+-------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/upgrading.html
+
+Bugfixes:
+
+- Fixed front-end not contacting the proper path on the API (!385)
+
+
 0.16.2 (2018-08-21)
 -------------------
 
+.. warning::
+
+  **This release is broken, do not use it. Upgrade to 0.16.3 or higher instead.**
+
+
 Upgrade instructions are available at
 https://docs.funkwhale.audio/upgrading.html
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index b897028f2..5319b3c32 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.16.2"
+__version__ = "0.16.3"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/instance-url.bugfix b/changes/changelog.d/instance-url.bugfix
deleted file mode 100644
index 356aa12a5..000000000
--- a/changes/changelog.d/instance-url.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed front-end not contacting the proper path on the API