refactor: merge branch 'main' into refactor/monorepo

2021-09-16 22:24:21 +05:30
parent 36246da9e1 4e8a4e8914
commit 98b9660956
98 changed files with 3969 additions and 3007 deletions
--- a/packages/hoppscotch-app/pages/settings.vue
+++ b/packages/hoppscotch-app/pages/settings.vue
@@ -298,7 +298,7 @@
              </div>
            </div>
            <div class="flex space-x-2 py-4 items-center">
-              <div class="flex flex-1 items-center relative">
+              <div class="flex flex-1 flex-col relative">
                <input
                  id="url"
                  v-model="PROXY_URL"