summary refs log tree commit diff
path: root/api/assets/inline-plugins
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 /api/assets/inline-plugins
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 '')
-rw-r--r--api/assets/inline-plugins/autoRegister.js (renamed from api/assets/preload-plugins/autoRegister.js)0
-rw-r--r--api/assets/inline-plugins/fosscord-login.js (renamed from api/assets/preload-plugins/fosscord-login.js)0
2 files changed, 0 insertions, 0 deletions
diff --git a/api/assets/preload-plugins/autoRegister.js b/api/assets/inline-plugins/autoRegister.js

index bb0b903d..bb0b903d 100644 --- a/api/assets/preload-plugins/autoRegister.js +++ b/api/assets/inline-plugins/autoRegister.js
diff --git a/api/assets/preload-plugins/fosscord-login.js b/api/assets/inline-plugins/fosscord-login.js
index 38f82200..38f82200 100644 --- a/api/assets/preload-plugins/fosscord-login.js +++ b/api/assets/inline-plugins/fosscord-login.js