Ignore:
Timestamp:
08/27/2024 08:03:55 AM (7 weeks ago)
Author:
Thomas Trepl <thomas@…>
Branches:
lazarus
Children:
53d0e62a
Parents:
7d55a6a (diff), c36ca685 (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 trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • server/major/major.xml

    r7d55a6a rde61ab1  
    2020  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kea.xml"/>
    2121  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="proftpd.xml"/>
    22   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vsftpd.xml"/>
     22<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vsftpd.xml"/> -->
    2323
    2424</chapter>
Note: See TracChangeset for help on using the changeset viewer.