Merge branch 'main' of github.com:koush/scrypted

koush · Mar 8, 2023 · f8c16ed · f8c16ed
2 parents ea86065 + ed5c7b1
commit f8c16ed
Show file tree

Hide file tree

Showing 7 changed files with 241 additions and 67 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -19,6 +19,7 @@
 [submodule "external/ring-client-api"]
 	path = external/ring-client-api
 	url = ../../koush/ring
+	branch = fork
 [submodule "plugins/vscode-typescript"]
 	path = plugins/vscode-typescript
 	url = ../../koush/scrypted-vscode-typescript/
@@ -28,9 +29,6 @@
 [submodule "plugins/zwave/file-stream-rotator"]
 	path = plugins/zwave/file-stream-rotator
 	url = ../../koush/file-stream-rotator.git
-[submodule "external/push-receiver"]
-	path = external/push-receiver
-	url = ../../koush/push-receiver.git
 [submodule "sdk/developer.scrypted.app"]
 	path = sdk/developer.scrypted.app
 	url = ../../koush/developer.scrypted.app

diff --git a/external/push-receiver b/external/push-receiver
diff --git a/external/ring-client-api b/external/ring-client-api