projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
66d8568
a8b704c
)
Merge branch 'getting_started' of https://github.com/cividesk/civicrm-core into civid...
author
Tim Otten
<totten@civicrm.org>
Tue, 18 Aug 2015 08:56:35 +0000
(
01:56
-0700)
committer
Tim Otten
<totten@civicrm.org>
Tue, 18 Aug 2015 08:56:35 +0000
(
01:56
-0700)
1
2
CRM/Core/BAO/Dashboard.php
patch
|
diff1
|
diff2
|
blob
|
history
CRM/Upgrade/Incremental/php/FourSeven.php
patch
|
diff1
|
diff2
|
blob
|
history
xml/templates/civicrm_navigation.tpl
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CRM/Core/BAO/Dashboard.php
Simple merge
diff --cc
CRM/Upgrade/Incremental/php/FourSeven.php
Simple merge
diff --cc
xml/templates/civicrm_navigation.tpl
Simple merge