]> Repos - mime-chat/commitdiff
Merge remote-tracking branch 'origin/main' into main
authorAndrew Gundersen <gundersena@xavier.edu>
Thu, 4 Mar 2021 17:05:41 +0000 (11:05 -0600)
committerAndrew Gundersen <gundersena@xavier.edu>
Thu, 4 Mar 2021 17:05:41 +0000 (11:05 -0600)
Merge audio code into new UI code

1  2 
src/App.vue
src/views/messenger.vue

diff --cc src/App.vue
Simple merge
index 91ccc8c08b6d1e0ef3d7eea490d6005d6735572c,30c67f34e6307c9a6fcb21b2e01256f90f785116..1c94af6062d5a7ee302b0825d0a1a9cd7960eb7a
@@@ -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>