Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Core
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents
- Service Desk

Snippets Groups Projects

f85fef43

Commit f85fef43 authored 12 years ago by Tim Otten

Downloads
- Plain Diff

Merge pull request #297 from dlobo/CRM-12254

CRM-12254

parents bc028df3 cbe8b99c

Branches

Tags

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

CRM/Core/BAO/File.php 12 additions, 4 deletions

CRM/Core/BAO/File.php
CRM/Core/Page/File.php 3 additions, 6 deletions

CRM/Core/Page/File.php
CRM/Custom/Form/DeleteFile.php 0 additions, 93 deletions

CRM/Custom/Form/DeleteFile.php
CRM/Dedupe/Merger.php 6 additions, 6 deletions

CRM/Dedupe/Merger.php
templates/CRM/Contact/Form/Edit/CustomData.tpl 3 additions, 0 deletions

templates/CRM/Contact/Form/Edit/CustomData.tpl
templates/CRM/Custom/Form/CustomData.tpl 2 additions, 0 deletions

templates/CRM/Custom/Form/CustomData.tpl
templates/CRM/Custom/Form/CustomField.tpl 1 addition, 1 deletion

templates/CRM/Custom/Form/CustomField.tpl
templates/CRM/Form/attachment.tpl 1 addition, 1 deletion

templates/CRM/Form/attachment.tpl
templates/CRM/Form/attachmentjs.tpl 4 additions, 4 deletions

templates/CRM/Form/attachmentjs.tpl

with 32 additions and 115 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