From: Andrew Gundersen <gundersena@xavier.edu>
Date: Thu, 4 Mar 2021 17:05:41 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/main' into main
X-Git-Tag: v0.9~63
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=83263d5f23d26b113cd22a7fd88b8dc5ef07d962;p=mime-chat

Merge remote-tracking branch 'origin/main' into main

Merge audio code into new UI code
---

83263d5f23d26b113cd22a7fd88b8dc5ef07d962
diff --cc src/views/messenger.vue
index 91ccc8c,30c67f3..1c94af6
--- a/src/views/messenger.vue
+++ b/src/views/messenger.vue
@@@ -1,10 -1,9 +1,10 @@@
  <template>
  
      <TextAudioInput />
 +    <!-- <InputItem /> -->
  
      <!-- List of message bubbles. -->
-     <div id="messenger" >
+     <div id="messenger">
        <MessageItem v-for="message in messages" :message="message" :key="message.id"/>
      </div>