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

f0985b26

Commit f0985b26 authored 11 years ago by Kurund Jalmi

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-10-18-35-58

Conflicts:
	sql/civicrm_generated.mysql
	xml/schema/Financial/OfficialReceipt.xml
	xml/schema/Financial/files.xml

parents 43de7088 b36758b8

Branches

Tags

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CRM/Core/BAO/EntityTag.php 4 additions, 4 deletions

CRM/Core/BAO/EntityTag.php
CRM/Member/Form/Membership.php 6 additions, 6 deletions

CRM/Member/Form/Membership.php
CRM/Upgrade/Incremental/sql/4.3.6.mysql.tpl 3 additions, 0 deletions

CRM/Upgrade/Incremental/sql/4.3.6.mysql.tpl
CRM/Utils/System/Drupal.php 25 additions, 21 deletions

CRM/Utils/System/Drupal.php
CRM/Utils/System/Drupal6.php 97 additions, 51 deletions

CRM/Utils/System/Drupal6.php
sql/civicrm_generated.mysql 36 additions, 45 deletions

sql/civicrm_generated.mysql
templates/CRM/Custom/Form/ContactReference.tpl 2 additions, 2 deletions

templates/CRM/Custom/Form/ContactReference.tpl
tests/phpunit/CiviTest/truncate.xml 0 additions, 2 deletions

tests/phpunit/CiviTest/truncate.xml
xml/schema/Financial/OfficialReceipt.xml 0 additions, 150 deletions

xml/schema/Financial/OfficialReceipt.xml
xml/schema/Financial/files.xml 0 additions, 1 deletion

xml/schema/Financial/files.xml

with 173 additions and 282 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