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

Posted to commits@isis.apache.org by jo...@apache.org on 2020/06/20 20:25:58 UTC

[isis] 07/09: Merge remote-tracking branch 'origin/master'

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

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

commit 64ee75df4a51809d21040df691b490c7d6910f17
Merge: d5e9cb1 f07ea5e
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Thu Jun 18 17:36:33 2020 +0200

    Merge remote-tracking branch 'origin/master'
    
    # Conflicts:
    #	.gitignore

 .gitignore                | 12 ++++--
 .idea/.gitignore          |  2 -
 .idea/gradle.xml          | 20 ----------
 .idea/jarRepositories.xml | 95 -----------------------------------------------
 .idea/kroviz.iml          |  9 -----
 .idea/misc.xml            | 17 ---------
 .idea/vcs.xml             |  8 ----
 core-parent/pom.xml       |  2 +-
 core/pom.xml              |  4 +-
 examples/demo/jee/pom.xml | 84 +++++++++++++++++++++++++++++++++++++++++
 starters/pom.xml          |  4 +-
 11 files changed, 97 insertions(+), 160 deletions(-)