-
- Downloads
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-11-10-56-09
Conflicts: sql/civicrm_generated.mysql xml/version.xml
No related branches found
No related tags found
Showing
- CRM/Activity/BAO/Activity.php 10 additions, 1 deletionCRM/Activity/BAO/Activity.php
- CRM/Admin/Form/OptionValue.php 2 additions, 2 deletionsCRM/Admin/Form/OptionValue.php
- CRM/Admin/Form/Setting.php 0 additions, 11 deletionsCRM/Admin/Form/Setting.php
- CRM/Admin/Form/Setting/Localization.php 7 additions, 6 deletionsCRM/Admin/Form/Setting/Localization.php
- CRM/Admin/Form/Setting/Url.php 2 additions, 1 deletionCRM/Admin/Form/Setting/Url.php
- CRM/Admin/Page/OptionValue.php 2 additions, 2 deletionsCRM/Admin/Page/OptionValue.php
- CRM/Badge/Form/Layout.php 4 additions, 4 deletionsCRM/Badge/Form/Layout.php
- CRM/Contact/BAO/Contact/Utils.php 9 additions, 6 deletionsCRM/Contact/BAO/Contact/Utils.php
- CRM/Contact/BAO/Query.php 4 additions, 3 deletionsCRM/Contact/BAO/Query.php
- CRM/Contribute/Task.php 5 additions, 0 deletionsCRM/Contribute/Task.php
- CRM/Core/BAO/CustomGroup.php 11 additions, 1 deletionCRM/Core/BAO/CustomGroup.php
- CRM/Core/BAO/UFGroup.php 1 addition, 1 deletionCRM/Core/BAO/UFGroup.php
- CRM/Core/DAO.php 2 additions, 2 deletionsCRM/Core/DAO.php
- CRM/Core/Error.php 10 additions, 2 deletionsCRM/Core/Error.php
- CRM/Core/Permission/Base.php 17 additions, 186 deletionsCRM/Core/Permission/Base.php
- CRM/Core/Permission/DrupalBase.php 206 additions, 0 deletionsCRM/Core/Permission/DrupalBase.php
- CRM/Core/Resources.php 2 additions, 1 deletionCRM/Core/Resources.php
- CRM/Custom/Form/Option.php 9 additions, 5 deletionsCRM/Custom/Form/Option.php
- CRM/Event/Form/ManageEvent/Registration.php 4 additions, 1 deletionCRM/Event/Form/ManageEvent/Registration.php
- CRM/Logging/Schema.php 12 additions, 7 deletionsCRM/Logging/Schema.php
Loading
Please register or sign in to comment