projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 982e99a 05a5b2c)
Merge branch 'master' of https://github.com/civicrm/civicrm-core into CRM-17745
authorJKingsnorth <john@johnkingsnorth.co.uk>
Mon, 4 Jan 2016 13:34:59 +0000 (13:34 +0000)
committerJKingsnorth <john@johnkingsnorth.co.uk>
Mon, 4 Jan 2016 13:34:59 +0000 (13:34 +0000)
1  2 
xml/schema/Event/Event.xml patch | diff1 | diff2 | blob | history

diff --cc xml/schema/Event/Event.xml
Simple merge