Ignore:
Timestamp:
09/15/2021 07:24:40 AM (3 years ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc
Children:
9af096e
Parents:
df1207e (diff), 06e7b361 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' into plabs/condxml

File:
1 edited

Legend:

Unmodified
Added
Removed
  • appendices/acknowledgments.xml

    rdf1207e rd4c8dce4  
    7676
    7777    <listitem>
    78       <para><ulink url="mailto:jmengual@linuxfromscratch.org">Jean-Philippe 
     78      <para><ulink url="mailto:jmengual@linuxfromscratch.org">Jean-Philippe
    7979      Mengual </ulink> &lt;jmengual@linuxfromscratch.org&gt; &ndash; French LFS
    8080      translation project 2008-2016</para>
     
    8282
    8383    <listitem>
    84       <para><ulink url="mailto:jlepiller@linuxfromscratch.org">Julien 
     84      <para><ulink url="mailto:jlepiller@linuxfromscratch.org">Julien
    8585      Lepiller </ulink> &lt;jlepiller@linuxfromscratch.org&gt; &ndash; French LFS
    8686      translation project 2017-present</para>
     
    100100
    101101    <listitem>
    102       <para><ulink url="mailto:info@linuxfromscratch.org.ru">Anton Maisak</ulink> 
     102      <para><ulink url="mailto:info@linuxfromscratch.org.ru">Anton Maisak</ulink>
    103103      &lt;info@linuxfromscratch.org.ru&gt; &ndash; Russian LFS
    104104      translation project</para>
     
    106106
    107107    <listitem>
    108       <para><ulink url="mailto:helen@linuxfromscratch.org.ru">Elena Shevcova</ulink> 
     108      <para><ulink url="mailto:helen@linuxfromscratch.org.ru">Elena Shevcova</ulink>
    109109      &lt;helen@linuxfromscratch.org.ru&gt; &ndash; Russian LFS
    110110      translation project</para>
Note: See TracChangeset for help on using the changeset viewer.