Merge branch 'getting_started' of https://github.com/cividesk/civicrm-core into civid...
authorTim Otten <totten@civicrm.org>
Tue, 18 Aug 2015 08:56:35 +0000 (01:56 -0700)
committerTim Otten <totten@civicrm.org>
Tue, 18 Aug 2015 08:56:35 +0000 (01:56 -0700)
1  2 
CRM/Core/BAO/Dashboard.php
CRM/Upgrade/Incremental/php/FourSeven.php
xml/templates/civicrm_navigation.tpl

Simple merge
Simple merge