Skip to content
Snippets Groups Projects
Commit 9b10578b authored by totten's avatar totten
Browse files

Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-18-17-02-24 

Conflicts:
	CRM/Contribute/Form/Contribution/Main.php
	api/v3/Generic/Setvalue.php
	templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
parents f6834dcc 144fb5a0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 225 additions and 83 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment