Skip to content
Snippets Groups Projects
Commit 35598dc5 authored by Kurund Jalmi's avatar Kurund Jalmi
Browse files

Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-21-22-31-28 

Conflicts:
	CRM/Report/Form/Contribute/TopDonor.php
	sql/civicrm_generated.mysql
	templates/CRM/Price/Form/Calculate.tpl
	xml/version.xml
parents 656c954b 1043c809
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 58 additions and 7 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment