Merge branch 'master' of git.happy-dev.fr:startinblox/applications/sib-app

2018-12-19 11:55:16 +01:00 · 2018-12-19 11:55:16 +01:00 · b94d22795e
parent 53d3429896 4f91b47bdd
commit b94d22795e
3 changed files with 3 additions and 3 deletions
--- a/src/config.json
+++ b/src/config.json
@ -4,8 +4,8 @@
    "sdn": "https://test-paris.happy-dev.fr",
    "cdn": "https://cdn.happy-dev.fr",
    "xmpp": "https://jabber.happy-dev.fr/http-bind/",
-    "client_id": "833925"
    //"client_id": "499509"
+    "client_id": "299390"
  },
  "prod": {
    "sdn": "https://test-paris.happy-dev.fr",
--- a/www/lib/sib-chat
+++ b/www/lib/sib-chat
@ -1 +1 @@
-Subproject commit 6a85c71851bc0a8b8f21e0ce9c64711fbc40ae08
+Subproject commit 7c841f1f972b6bbe35608a5c980101dbe117741c
--- a/www/lib/sib-core
+++ b/www/lib/sib-core
@ -1 +1 @@
-Subproject commit 933e5424108c54a0b7c6977ee226377b6abe0e7c
+Subproject commit f80f4288c8ab06225f02c7b2545372ad4caca891