nightly

Change-Id: I6ce71d7ecf2e97dbdc0a47be65249caff40028ba

Jenkinsfile

@@ -139,7 +139,8 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
                       git reset --hard origin/${params.CHANNEL}
                       # Submodules are generally not managed by merging
                       git status
-                      git merge -X theirs --no-commit FETCH_HEAD
+                      rm -rf client-gnome lrc-gnome
+                      git merge -X theirs --no-commit FETCH_HEAD || git status && git add `git diff --name-status --diff-filter=U | awk '{print \$2}'`
                    """
             }
         }

client-qt @ 300ac17d

-Subproject commit 1a14fd27fe6d99ae130604daaf1cc0d99aec1040
+Subproject commit 300ac17db3372cd7e9c52cc77eafca0c63bcbbe2

daemon @ 3e832042

-Subproject commit 72a7d2339a1ba9bb1cf356f19c28deeb2f9be76e
+Subproject commit 3e83204248340d2548051bdbf087b451b9dad9dd