Merge branch 'master' into vuejs

This commit is contained in:
fabio-eiq 2021-01-25 15:38:05 +01:00
commit 8a1a8bc9a0
3 changed files with 2 additions and 6 deletions

5
.gitmodules vendored
View file

@ -1,9 +1,6 @@
[submodule "platypush/plugins/gpio/sensor/ir/mlx90640/lib"] [submodule "platypush/plugins/gpio/sensor/ir/mlx90640/lib"]
path = platypush/plugins/camera/ir/mlx90640/lib path = platypush/plugins/camera/ir/mlx90640/lib
url = https://github.com/pimoroni/mlx90640-library url = https://github.com/pimoroni/mlx90640-library
[submodule "webext"]
path = webext
url = https://github.com/BlackLight/platypush-webext.git
[submodule "docs/wiki"] [submodule "docs/wiki"]
path = docs/wiki path = docs/wiki
url = git@git.platypush.tech:platypush/platypush.wiki.git url = https://git.platypush.tech/platypush/platypush.wiki.git

@ -1 +1 @@
Subproject commit 4198e234d0b37b9e82546716ae4a3e4d93157989 Subproject commit 070d113f423ed1ce90cc354f1d9ea2e562bc6033

1
webext

@ -1 +0,0 @@
Subproject commit 6f91a3c295f2aa5d54f302c6397c3a57f47cfb03