Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/3.1.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
ewencp committed Oct 17, 2016
2 parents 2041519 + 5697752 commit 0b590cd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/assembly/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions src/assembly/standalone.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 0b590cd

Please sign in to comment.