projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3842bdc 0b6b8bf)
Merge branch '5.65'
authorSeamus Lee <seamuslee001@gmail.com>
Wed, 6 Sep 2023 23:25:31 +0000 (09:25 +1000)
committerSeamus Lee <seamuslee001@gmail.com>
Wed, 6 Sep 2023 23:25:31 +0000 (09:25 +1000)
1  2 
CRM/Core/EntityTokens.php patch | diff1 | diff2 | blob | history
CRM/Core/I18n/SchemaStructure.php patch | diff1 | diff2 | blob | history
CRM/Event/DAO/Event.php patch | diff1 | diff2 | blob | history
xml/schema/Event/Event.xml patch | diff1 | diff2 | blob | history

diff --cc CRM/Core/EntityTokens.php
Simple merge
diff --cc CRM/Core/I18n/SchemaStructure.php
Simple merge
diff --cc CRM/Event/DAO/Event.php
index 527c2384ccc81b39464d41f94bb6c2e8d242aaaf,ffe17d4337419108fb7400230f6e4fdaa0916be4..2d6e3fa421d3d270f243970ae24129f908082d21
--- 1/CRM/Event/DAO/Event.php
--- 2/CRM/Event/DAO/Event.php
+++ b/CRM/Event/DAO/Event.php
@@@ -6,7 -6,7 +6,7 @@@
   *
   * Generated from xml/schema/CRM/Event/Event.xml
   * DO NOT EDIT.  Generated by CRM_Core_CodeGen
-  * (GenCodeChecksum:bb7ac64bd8f09b5afb145f09baf9f08d)
 - * (GenCodeChecksum:bdb38b76e64a2eeac5c2f214aabad598)
++ * (GenCodeChecksum:80eed9bb6b3badce7199dd8da7f3f14b)
   */
  
  /**
diff --cc xml/schema/Event/Event.xml
Simple merge