summary refs log tree commit diff
path: root/fosscord-server.code-workspace
diff options
context:
space:
mode:
authorTheArcaneBrony <myrainbowdash949@gmail.com>2022-08-06 02:33:12 +0200
committerGitHub <noreply@github.com>2022-08-06 02:33:12 +0200
commit88916865eec7812029ce9a150f6a7646ff09aea3 (patch)
treeb9cf427d3c173cbe4029e5230eda6acc4fd61cf0 /fosscord-server.code-workspace
parentMerge branch 'master' into 2fa (diff)
parentMerge pull request #804 from MaddyUnderStars/feat/notesTable (diff)
downloadserver-88916865eec7812029ce9a150f6a7646ff09aea3.tar.xz
Merge branch 'master' into 2fa
Diffstat (limited to 'fosscord-server.code-workspace')
-rw-r--r--fosscord-server.code-workspace3
1 files changed, 1 insertions, 2 deletions
diff --git a/fosscord-server.code-workspace b/fosscord-server.code-workspace

index e618b7f0..7491cb35 100644 --- a/fosscord-server.code-workspace +++ b/fosscord-server.code-workspace
@@ -24,6 +24,5 @@ { "path": "webrtc" } - ], - "settings": {} + ] }