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)
commit60ad909e283a55683e59c9fb5333dc58ba84d42d
tree147bd63fcb382074f17963573ba61950e8bc15d4
parent66d8568c572fb429dfd11b310ed257594cdcbbf8
parenta8b704c504f1c80ad5f49f7495162d480e8dff29
Merge branch 'getting_started' of https://github.com/cividesk/civicrm-core into cividesk-getting_started
CRM/Core/BAO/Dashboard.php
CRM/Upgrade/Incremental/php/FourSeven.php
xml/templates/civicrm_navigation.tpl