Commit 0b590cdd authored by Ewen Cheslack-Postava's avatar Ewen Cheslack-Postava
Browse files

Merge remote-tracking branch 'origin/3.1.x'

parents 2041519f 56977521

src/assembly/package.xml

+2 −0
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 
                <include>README*</include>

                <include>LICENSE*</include>

                <include>NOTICE*</include>

                <include>licenses.html</include>

                <include>licenses/</include>

                <include>notices/</include>

            </includes>

        </fileSet>

        <fileSet>

src/assembly/standalone.xml

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
                <include>README*</include>

                <include>LICENSE*</include>

                <include>NOTICE*</include>

                <include>licenses.html</include>

                <include>licenses/</include>

                <include>notices/</include>

            </includes>

        </fileSet>

    </fileSets>