Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Core
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents
- Service Desk

Snippets Groups Projects

79cffafa

Commit 79cffafa authored 11 years ago by colemanw

Downloads
- Plain Diff

Merge branch '4.4' of https://github.com/civicrm/civicrm-core

Conflicts:
	sql/civicrm_generated.mysql
	templates/CRM/Activity/Form/Task/AddToTag.tpl
	xml/version.xml

parents 5948bc7c 9fd4371f

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

CRM/Activity/BAO/Activity.php 1 addition, 1 deletion

CRM/Activity/BAO/Activity.php
CRM/Core/BAO/Dashboard.php 3 additions, 2 deletions

CRM/Core/BAO/Dashboard.php
CRM/Upgrade/Incremental/sql/4.4.5.mysql.tpl 1 addition, 0 deletions

CRM/Upgrade/Incremental/sql/4.4.5.mysql.tpl
CRM/Utils/Check/Security.php 1 addition, 1 deletion

CRM/Utils/Check/Security.php
CRM/Utils/File.php 4 additions, 0 deletions

CRM/Utils/File.php
api/v3/DashboardContact.php 2 additions, 2 deletions

api/v3/DashboardContact.php
templates/CRM/Activity/Form/Task/AddToTag.tpl 0 additions, 52 deletions

templates/CRM/Activity/Form/Task/AddToTag.tpl
xml/schema/Core/IM.xml 5 additions, 0 deletions

xml/schema/Core/IM.xml

with 17 additions and 58 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment