projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d4e756e 50577ef)
Merge branch 4.6 into master
authorColeman Watts <coleman@civicrm.org>
Wed, 7 Oct 2015 18:51:50 +0000 (14:51 -0400)
committerColeman Watts <coleman@civicrm.org>
Wed, 7 Oct 2015 18:51:50 +0000 (14:51 -0400)
commit71f7de786e8da429b2e8d630cb3ec1bf02f529e9
treecdc20731b174c93d0908a6f47725e8f071e692bbtree | snapshot (zip tar.gz)
parentd4e756e0e56c4842a5266eaa4c7f26cb5a0facaecommit | diff
parent50577ef559afd456c0edd32e20df4f5ed7f2e356commit | diff
Merge branch 4.6 into master

Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl diff1 | diff2 | blob | history