projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9167a90 e5fcc24)
Merge remote-tracking branch 'upstream/4.7.10-rc' into 4.7.10-rc-master-2016-08-09...
authorKurund Jalmi <kurund@yahoo.com>
Tue, 9 Aug 2016 09:17:14 +0000 (14:47 +0530)
committerKurund Jalmi <kurund@yahoo.com>
Tue, 9 Aug 2016 09:17:14 +0000 (14:47 +0530)
1  2 
CRM/Utils/Check/Component/Env.php patch | diff1 | diff2 | blob | history
sql/civicrm_generated.mysql patch | diff1 | diff2 | blob | history

diff --cc CRM/Utils/Check/Component/Env.php
Simple merge
diff --cc sql/civicrm_generated.mysql
Simple merge