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

Posted to commits@isis.apache.org by da...@apache.org on 2018/10/09 09:59:07 UTC

[isis] 03/05: Merge branch 'ISIS-2003'

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

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

commit 4ac0f538b88744472e865fcbade93607033b6c9f
Merge: 18b0f4f 3bcd905
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 9 10:15:04 2018 +0100

    Merge branch 'ISIS-2003'

 .../application/integtests/mml/.gitignore          |  1 -
 .../integtests/mml/MetaModelService_IntegTest.java | 29 +++++++++++++++++++---
 ...mainAppFixtureScriptsSpecificationProvider.xml} |  0
 ...lication.services.homepage.HomePageService.xml} |  0
 ...cation.services.homepage.HomePageViewModel.xml} |  0
 ...inapp.modules.simple.dom.impl.SimpleObject.xml} |  0
 ...napp.modules.simple.dom.impl.SimpleObjects.xml} |  0
 .../java.lang.Long.xml}                            |  0
 .../java.lang.Object.xml}                          |  0
 .../java.lang.String.xml}                          |  0
 .../java.net.URL.xml}                              |  0
 .../java.sql.Timestamp.xml}                        |  0
 .../java.util.List.xml}                            |  0
 ...applib.services.layout.LayoutService$Style.xml} |  0
 .../org.apache.isis.applib.value.Clob.xml}         |  0
 .../mml/{_void.approved.xml => approved/void.xml}  |  0
 .../application/integtests/mml/received/.gitignore |  1 +
 17 files changed, 27 insertions(+), 4 deletions(-)