projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
be0f31c
e16fa8d
)
Merge pull request #4927 from totten/master-setupsh-data
author
Tim Otten
<totten@civicrm.org>
Wed, 14 Jan 2015 00:28:17 +0000
(16:28 -0800)
committer
Tim Otten
<totten@civicrm.org>
Wed, 14 Jan 2015 00:28:17 +0000
(16:28 -0800)
bin/setup.sh - Distinguish the plain (civicrm_data.mysql) and example (civicrm_generated.mysql) options
Trivial merge