projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70c0fed fcfadbd)
Merge pull request #16684 from civicrm/5.23
authorEileen McNaughton <emcnaughton@wikimedia.org>
Wed, 4 Mar 2020 23:52:39 +0000 (12:52 +1300)
committerGitHub <noreply@github.com>
Wed, 4 Mar 2020 23:52:39 +0000 (12:52 +1300)
5.23

1  2 
sql/civicrm_generated.mysql patch | diff1 | diff2 | blob | history
xml/templates/civicrm_data.tpl patch | diff1 | diff2 | blob | history

diff --cc sql/civicrm_generated.mysql
Simple merge
diff --cc xml/templates/civicrm_data.tpl
Simple merge