Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dataprocessor
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

50902be7

Commit 50902be7 authored 5 years ago by jaapjansma

Downloads
- Plain Diff

fixed merge conflict

parents f7c6c569 eac84b30

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 18 additions, 0 deletions

CHANGELOG.md
CRM/Dataprocessor/BAO/DataProcessor.php 6 additions, 0 deletions

CRM/Dataprocessor/BAO/DataProcessor.php
CRM/Dataprocessor/Utils/Cache.php 58 additions, 0 deletions

CRM/Dataprocessor/Utils/Cache.php
Civi/DataProcessor/DataSpecification/MaxFieldSpecification.php 22 additions, 0 deletions

...DataProcessor/DataSpecification/MaxFieldSpecification.php
Civi/DataProcessor/FieldOutputHandler/GroupsOfContactFieldOutputHandler.php 2 additions, 2 deletions

.../FieldOutputHandler/GroupsOfContactFieldOutputHandler.php
Civi/DataProcessor/Output/Api.php 25 additions, 3 deletions

Civi/DataProcessor/Output/Api.php

with 131 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment