[webjars-locator] 02/02: Merge tag 'upstream/0.30'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository webjars-locator.

commit 232a64e0bbeff3b24d2c7bae9f28d4251a03c47e
Merge: f1a5b3b 3eea495
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 26 10:07:22 2016 +0200

    Merge tag 'upstream/0.30'
    
    Upstream version 0.30

 .gitignore                                         |  32 ++
 .travis.yml                                        |   7 +
 LICENSE.md                                         |  18 +
 README.md                                          |  23 +
 pom.xml                                            | 162 ++++++
 src/main/java/org/webjars/RequireJS.java           | 625 +++++++++++++++++++++
 .../org.webjars.urlprotocols.UrlProtocolHandler    |   3 +
 src/test/java/org/webjars/RequireJSTest.java       | 110 ++++
 .../resources/webjars/bar-node/1.0.0/bar.js        |   1 +
 .../resources/webjars/bar-node/1.0.0/package.json  |   3 +
 .../META-INF/resources/webjars/foo/1.0.0/foo.js    |   1 +
 .../resources/webjars/foo/1.0.0/foo.js.map         |   0
 .../multiple/1.0.0/module/multiple_module.js       |   1 +
 .../resources/webjars/multiple/1.0.0/multiple.js   |   1 +
 .../multiple/2.0.0/module/multiple_module.js       |   1 +
 .../resources/webjars/multiple/2.0.0/multiple.js   |   1 +
 .../resources/webjars/spaces/1.0.0/space space.js  |   1 +
 src/test/resources/jquery-2.1.1.jar                | Bin 0 -> 157999 bytes
 src/test/resources/mailcheck-1.1.0.jar             | Bin 0 -> 6308 bytes
 .../resources/webjars/spaces/2.0.0/spaces.js       |   0
 20 files changed, 990 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/webjars-locator.git