[jspwiki] 01/01: Merge pull request #2 from sgoeschl/JSPWIKI-1073

[juanpablo]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 3c952f37a2d87f86886e331634dfabebfb66b53f
Merge: 60c2327 1d6c91a
Author: Juan Pablo Santos Rodríguez <juanpablo.san...@gmail.com>
AuthorDate: Fri Aug 31 17:29:08 2018 +0200

    Merge pull request #2 from sgoeschl/JSPWIKI-1073
    
    JSPWIKI-1073 Upgrade the jspwiki-portable build

 .gitignore                                         |   4 +-
 jspwiki-portable/build.xml                         |   4 +-
 jspwiki-portable/readme.md                         | 125 ++++++++++-----------
 .../WEB-INF/classes/jspwiki-custom.properties      |   3 +-
 .../WEB-INF/classes/jspwiki-custom.properties      |   2 +
 5 files changed, 71 insertions(+), 67 deletions(-)