[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - 2 commits - helpcontent2

[Olivier Hallot (via logerrit)]

 helpcontent2 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f7981965822715504aee26c3f7684b86e4d2dec8
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Sat Nov 16 08:37:42 2019 -0300
Commit:     Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Fri Nov 22 11:37:21 2019 +0100

    Update git submodules
    
    * Update helpcontent2 from branch 'libreoffice-6-4'
      - tdf#128227 disambiguate text frame and text box
    
        in summary,
        on Writer, Text frame -> Frame
        On other modules
        Text Frame -> text box
    
        Change-Id: I3b218fafb03cd5ab79c8c0b902ec417bf5445ff8
        Reviewed-on: https://gerrit.libreoffice.org/82976
        Tested-by: Jenkins
        Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
        (cherry picked from commit e20b575c56ebe912501e932192e509b6a227ce3c)
        Reviewed-on: https://gerrit.libreoffice.org/83451

diff --git a/helpcontent2 b/helpcontent2
index fee1c9897247..dddd28a6173b 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fee1c989724756b1a7a001a4a1964cd38c09b409
+Subproject commit dddd28a6173bf590d8b4ea8ca886c0a732e50551
commit ad5e85c076080760baf65fce4ac251c170339459
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Thu Nov 14 13:50:32 2019 -0300
Commit:     Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Fri Nov 22 11:37:02 2019 +0100

    Update git submodules
    
    * Update helpcontent2 from branch 'libreoffice-6-4'
      - Fix L10N of xapian templates
    
        Change-Id: I23e3adc4a4232e9f9d998fa9f41951f7c530c335
        Reviewed-on: https://gerrit.libreoffice.org/82721
        Tested-by: Jenkins
        Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
        (cherry picked from commit 4ad79a357b335ab87b0565ec18b3d17044ab502e)
        Reviewed-on: https://gerrit.libreoffice.org/83448

diff --git a/helpcontent2 b/helpcontent2
index 69ff0a1d2a16..fee1c9897247 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 69ff0a1d2a16290e9d1549dd6bf3049cf0ad719e
+Subproject commit fee1c989724756b1a7a001a4a1964cd38c09b409