Merge branch 'master' of git.thengo.net:ka/ansible-roles

3 роки тому · a30f653f4e
--- a/.gitmodules
+++ b/.gitmodules
@@ -261,7 +261,15 @@
 	path = kita-pro-desktop
 	url = ../ansible-role-kita-pro-desktop.git
 	branch = master
 [submodule "touchpad"]
 	path = touchpad
 	url = ../ansible-role-touchpad.git
 [submodule "nodejs"]
 	path = nodejs
 	url = ../ansible-role-nodejs.git
 [submodule "conda"]
 	path = conda
 	url = ../ansible-role-conda.git
 [submodule "dconf-lock"]
 	path = dconf-lock
 	url = ../ansible-role-dconf-lock.git
 	branch = master
--- a/conda
+++ b/conda
@@ -0,0 +1 @@
 Subproject commit 7d98a330656ea84896b32b4f809949936542552b
--- a/debian_repos
+++ b/debian_repos
@@ -1 +1 @@
 Subproject commit 59f91c6d991d57bb24d359728226aa748664ae1b
 Subproject commit 27fd5b34b24bfa9a270f308391c9534be742bacd
--- a/nodejs
+++ b/nodejs
@@ -0,0 +1 @@
 Subproject commit ee6672bc4f2c719fff61ddbdfc244ad235747454
--- a/touchpad
+++ b/touchpad
@@ -0,0 +1 @@
 Subproject commit 70385eb2326005a66b21ac84107faed7f6ae1685