projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6ec153 3cbb42f)
Merge in 5.31
authorSeamus Lee <seamuslee001@gmail.com>
Thu, 5 Nov 2020 22:45:31 +0000 (09:45 +1100)
committerSeamus Lee <seamuslee001@gmail.com>
Thu, 5 Nov 2020 22:45:31 +0000 (09:45 +1100)
1  2 
CRM/Contact/DAO/Group.php patch | diff1 | diff2 | blob | history
xml/schema/Contact/Group.xml patch | diff1 | diff2 | blob | history

diff --cc CRM/Contact/DAO/Group.php
index ff7e1c8beb51bf0c0a6614e18faa9720bd27be44,d0d027ed2ea68d04b30a4a58d7debba7f07efb35..b126c0e9fdd09e20655366d0f9562b98b7bf69a5
--- 1/CRM/Contact/DAO/Group.php
--- 2/CRM/Contact/DAO/Group.php
+++ b/CRM/Contact/DAO/Group.php
@@@ -6,7 -6,7 +6,7 @@@
   *
   * Generated from xml/schema/CRM/Contact/Group.xml
   * DO NOT EDIT.  Generated by CRM_Core_CodeGen
-  * (GenCodeChecksum:49027c63bf6fd142e79220b39f84056d)
 - * (GenCodeChecksum:cab0c1d345870ec17420e9100fe2518f)
++ * (GenCodeChecksum:e40e779ac8e9bec5ea4d6c55f6f3b863)
   */
  
  /**
diff --cc xml/schema/Contact/Group.xml
Simple merge