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

Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-13-15-43-24 

Conflicts:
	CRM/Case/Form/Activity.php
	CRM/Utils/REST.php
	sql/civicrm_generated.mysql
	xml/version.xml
parents b873029b 11ee5a30
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 127 additions and 80 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment