More Fixes after merge.
authordpradeep <pradeep.dorugade@webaccess.co.in>
Thu, 7 Aug 2014 16:30:00 +0000 (22:00 +0530)
committerdpradeep <pradeep.dorugade@webaccess.co.in>
Thu, 7 Aug 2014 16:30:00 +0000 (22:00 +0530)
commitfff0f4496622a61a3a774f58836a473f96dcd66c
tree04f781e7d6c6334e8fefc767721bdc881178462e
parent9fd0fde095281e382b27107c43e1346196cc4c87
More Fixes after merge.
CRM/Admin/Form/Preferences.php
CRM/Admin/Form/Preferences/Contribute.php
CRM/Price/BAO/PriceField.php
sql/civicrm_generated.mysql
xml/templates/civicrm_navigation.tpl