Resolve merge conflict

1 files changed, 6 insertions, 2 deletions

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 6a7669ce..bc1d1acc 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -17,11 +17,11 @@ import FollowRequests from '../components/follow_requests/follow_requests.vue'
 import OAuthCallback from '../components/oauth_callback/oauth_callback.vue'
 import UserSearch from '../components/user_search/user_search.vue'
 
-const afterStoreSetup = ({store, i18n}) => {
+const afterStoreSetup = ({ store, i18n }) => {
   window.fetch('/api/statusnet/config.json')
     .then((res) => res.json())
     .then((data) => {
-      const {name, closed: registrationClosed, textlimit, uploadlimit, server} = data.site
+      const { name, closed: registrationClosed, textlimit, uploadlimit, server, vapidPublicKey } = data.site
 
       store.dispatch('setInstanceOption', { name: 'name', value: name })
       store.dispatch('setInstanceOption', { name: 'registrationOpen', value: (registrationClosed === '0') })
@@ -32,6 +32,10 @@ const afterStoreSetup = ({store, i18n}) => {
       store.dispatch('setInstanceOption', { name: 'bannerlimit', value: parseInt(uploadlimit.bannerlimit) })
       store.dispatch('setInstanceOption', { name: 'server', value: server })
 
+      if (vapidPublicKey) {
+        store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
+      }
+
       var apiConfig = data.site.pleromafe
 
       window.fetch('/static/config.json')