Merge branch 'f24' into connect-frontend-backend-db

CMU-17313Q · Sep 26, 2024 · 1950ffc · 1950ffc
2 parents 0a0e853 + 10b9daf
commit 1950ffc
Show file tree

Hide file tree

Showing 42 changed files with 3,433 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 dist/
 yarn.lock
 npm-debug.log
+
 sftp-config.json
 config.json
 jsconfig.json
@@ -71,4 +72,4 @@ link-plugins.sh
 test.sh
 
 .docker/**
-!**/.gitkeep
+!**/.gitkeep
diff --git a/node_modules/nodebb-plugin-composer-default/.eslintrc b/node_modules/nodebb-plugin-composer-default/.eslintrc
diff --git a/node_modules/nodebb-plugin-composer-default/.gitattributes b/node_modules/nodebb-plugin-composer-default/.gitattributes
diff --git a/node_modules/nodebb-plugin-composer-default/.jshintrc b/node_modules/nodebb-plugin-composer-default/.jshintrc
diff --git a/node_modules/nodebb-plugin-composer-default/LICENSE b/node_modules/nodebb-plugin-composer-default/LICENSE
diff --git a/node_modules/nodebb-plugin-composer-default/README.md b/node_modules/nodebb-plugin-composer-default/README.md
diff --git a/node_modules/nodebb-plugin-composer-default/controllers.js b/node_modules/nodebb-plugin-composer-default/controllers.js