You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@annotator.apache.org by ge...@apache.org on 2020/03/29 14:04:45 UTC

[incubator-annotator] 01/01: Merge pull request #67 from apache/reorg-webpack

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

gerben pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git

commit d976c22adfad28aa736d440882491cbfd802057a
Merge: 9386ee8 0c94381
Author: Gerben <ge...@treora.com>
AuthorDate: Sun Mar 29 16:04:37 2020 +0200

    Merge pull request #67 from apache/reorg-webpack
    
    Reorganise webpack-related files

 .gitignore                                 |  1 +
 package.json                               |  7 +++--
 {demo => web/demo}/index.html              |  3 +-
 {demo => web/demo}/index.js                |  0
 index.html => web/index.html               |  5 ++--
 {test => web/test}/index.html              |  3 +-
 webpack.config.js => web/webpack.config.js | 22 +++++++++++++--
 yarn.lock                                  | 45 ++++++++++++++++++++++++++++++
 8 files changed, 77 insertions(+), 9 deletions(-)