Skip to content
GitLab
Explore
Sign in
Development
CiviCRM Core
Repository
core
CRM
Core
BAO
ConfigSetting.php
Find file
Blame
History
Permalink
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-16-18-06-10
· 3a1ac5e5
Kurund Jalmi
authored
Aug 16, 2015
Conflicts: sql/civicrm_generated.mysql templates/CRM/Member/Form/MembershipRenewal.tpl
3a1ac5e5