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

67be46e6

Commit 67be46e6 authored 11 years ago by Kurund Jalmi

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-14-04-44-13

Conflicts:
	CRM/Contribute/PseudoConstant.php
	CRM/Upgrade/Incremental/php/FourThree.php

parents 3ec1ed78 dce95f9e

Branches

Tags

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

CRM/Contribute/BAO/Query.php 12 additions, 4 deletions

CRM/Contribute/BAO/Query.php
CRM/Contribute/Form/ContributionBase.php 2 additions, 2 deletions

CRM/Contribute/Form/ContributionBase.php
CRM/Contribute/PseudoConstant.php 36 additions, 0 deletions

CRM/Contribute/PseudoConstant.php
CRM/Upgrade/Incremental/php/FourThree.php 94 additions, 2 deletions

CRM/Upgrade/Incremental/php/FourThree.php
CRM/Utils/System/Joomla.php 1 addition, 1 deletion

CRM/Utils/System/Joomla.php
templates/CRM/Event/Form/SearchEvent.tpl 1 addition, 1 deletion

templates/CRM/Event/Form/SearchEvent.tpl
tools/templates/CRM/Auction/Form/SearchAuction.tpl 2 additions, 2 deletions

tools/templates/CRM/Auction/Form/SearchAuction.tpl
xml/schema/Contribute/ContributionRecur.xml 2 additions, 2 deletions

xml/schema/Contribute/ContributionRecur.xml

with 150 additions and 14 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