Michael Hoennig 1aed3236a5 Merge branch 'jhipster-generated' ... # Conflicts: # build.gradle # cfg/spotless/eclipse_formatter.xml # cfg/spotless/hsadminng.importorder # src/main/java/org/hostsharing/hsadminng/HsadminNgApp.java # src/main/java/org/hostsharing/hsadminng/domain/Asset.java # src/main/java/org/hostsharing/hsadminng/domain/Membership.java # src/main/java/org/hostsharing/hsadminng/domain/SepaMandate.java # src/main/java/org/hostsharing/hsadminng/domain/Share.java # src/main/java/org/hostsharing/hsadminng/repository/MembershipRepository.java # src/main/java/org/hostsharing/hsadminng/security/SecurityUtils.java # src/main/java/org/hostsharing/hsadminng/service/AssetService.java # src/main/java/org/hostsharing/hsadminng/service/CustomerQueryService.java # src/main/java/org/hostsharing/hsadminng/service/MembershipQueryService.java # src/main/java/org/hostsharing/hsadminng/service/MembershipService.java # src/main/java/org/hostsharing/hsadminng/service/SepaMandateQueryService.java # src/main/java/org/hostsharing/hsadminng/service/ShareService.java # src/main/java/org/hostsharing/hsadminng/service/dto/AssetDTO.java # src/main/java/org/hostsharing/hsadminng/service/dto/CustomerCriteria.java # src/main/java/org/hostsharing/hsadminng/service/dto/CustomerDTO.java # src/main/java/org/hostsharing/hsadminng/service/dto/MembershipDTO.java # src/main/java/org/hostsharing/hsadminng/service/dto/SepaMandateDTO.java # src/main/java/org/hostsharing/hsadminng/service/dto/ShareDTO.java # src/main/java/org/hostsharing/hsadminng/service/mapper/CustomerMapper.java # src/main/java/org/hostsharing/hsadminng/web/rest/AssetResource.java # src/main/java/org/hostsharing/hsadminng/web/rest/ShareResource.java # src/main/java/org/hostsharing/hsadminng/web/rest/errors/ExceptionTranslator.java # src/test/java/org/hostsharing/hsadminng/web/rest/AssetResourceIntTest.java # src/test/java/org/hostsharing/hsadminng/web/rest/CustomerResourceIntTest.java # src/test/java/org/hostsharing/hsadminng/web/rest/MembershipResourceIntTest.java # src/test/java/org/hostsharing/hsadminng/web/rest/SepaMandateResourceIntTest.java # src/test/java/org/hostsharing/hsadminng/web/rest/ShareResourceIntTest.java		2019-04-30 17:13:06 +02:00
..
spotless	Merge branch 'jhipster-generated'	2019-04-30 17:13:06 +02:00