From 53d342989698823b7672d96b90fc0a54d83dbc30 Mon Sep 17 00:00:00 2001 From: Gaelle Morin Date: Wed, 19 Dec 2018 11:30:05 +0100 Subject: [PATCH 1/2] config.json added in gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e9400a4..d49d2e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /node_modules -/src/config.js +/src/config.json /www/index.html /www/index.prod.html /www/styles/ From edf01c417a0980b0075a0811630eb6b08bde26f3 Mon Sep 17 00:00:00 2001 From: Gaelle Morin Date: Wed, 19 Dec 2018 11:56:41 +0100 Subject: [PATCH 2/2] master pulled + submodules updated --- www/lib/sib-chat | 2 +- www/lib/sib-core | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www/lib/sib-chat b/www/lib/sib-chat index 7c841f1..6a85c71 160000 --- a/www/lib/sib-chat +++ b/www/lib/sib-chat @@ -1 +1 @@ -Subproject commit 7c841f1f972b6bbe35608a5c980101dbe117741c +Subproject commit 6a85c71851bc0a8b8f21e0ce9c64711fbc40ae08 diff --git a/www/lib/sib-core b/www/lib/sib-core index f80f428..a532e57 160000 --- a/www/lib/sib-core +++ b/www/lib/sib-core @@ -1 +1 @@ -Subproject commit f80f4288c8ab06225f02c7b2545372ad4caca891 +Subproject commit a532e579d3303de73477c33f534556104837f648