Fix rebase
[civicrm-core.git] / .editorconfig
2018-02-01 Eileen McNaughtonMerge pull request #9746 from vedantrathore/master
2017-12-02 colemanwMerge pull request #9648 from MegaphoneJon/CRM-19608
2017-11-15 Mathieu LuMerge pull request #9739 from nditech/CRM-19915
2017-09-27 colemanwMerge pull request #9925 from jmcclelland/CRM-20217
2017-09-05 Eileen McNaughtonMerge pull request #9783 from mattwire/back_to_single_lang
2017-08-16 Eileen McNaughtonMerge pull request #9410 from jmcclelland/CRM-19664
2017-06-26 colemanwMerge pull request #9886 from JMAConsulting/CRM-20169
2017-06-17 Mathieu LuMerge pull request #9790 from fliespl/patch-3
2017-06-11 Tim OttenMerge pull request #9779 from WeMoveEU/CRM-19963
2017-05-21 Eileen McNaughtonMerge pull request #9854 from adixon/CRM-20040
2017-05-11 colemanwMerge pull request #9864 from PalanteJon/CRM-19977
2017-05-03 Eileen McNaughtonMerge pull request #10012 from agh1/crm-20297
2017-04-23 Eileen McNaughtonMerge pull request #9471 from adixon/CRM-19697
2017-04-12 Eileen McNaughtonMerge pull request #10147 from KarinG/CRM-20393-dmaster
2017-04-07 Monish DebMerge pull request #9773 from monishdeb/CRM-19663
2017-04-04 Tim OttenMerge pull request #9616 from ErichBSchulz/feature...
2017-04-04 Eileen McNaughtonMerge pull request #9724 from civicrm/michaelmcandrew...
2017-03-29 Eileen McNaughtonMerge pull request #8525 from twomice/CRM-18251b
2017-03-27 Joe MurrayMerge pull request #9694 from systopia/CRM-19892
2017-03-23 Eileen McNaughtonMerge pull request #9968 from fuzionnz/remove_crm_core_...
2017-03-23 Tim OttenMerge pull request #9869 from omarabuhussein/CRM-20140...
2017-03-21 Eileen McNaughtonMerge pull request #9788 from fliespl/patch-1
2017-03-21 Tim OttenMerge pull request #10016 from ErichBSchulz/refaction_e...
2017-03-19 Eileen McNaughtonMerge pull request #8980 from ergonlogic/dev/CRM-19308
2017-03-19 Eileen McNaughtonMerge pull request #9789 from fliespl/patch-2
2017-03-17 Eileen McNaughtonMerge pull request #9979 from mattwire/disable_payment_...
2017-03-16 colemanwMerge pull request #9802 from eileenmcnaughton/lower
2017-03-16 Eileen McNaughtonMerge pull request #9602 from eileenmcnaughton/triggers
2017-03-14 Yashodha ChakuMerge pull request #9776 from jitendrapurohit/CRM-19741
2017-03-14 Tim OttenMerge pull request #9420 from eileenmcnaughton/settings
2017-03-13 Tim OttenMerge pull request #9910 from seamuslee001/CRM-19835
2017-03-12 Eileen McNaughtonMerge pull request #9836 from jmcclelland/CRM-20020
2017-03-10 Eileen McNaughtonMerge pull request #9815 from WeMoveEU/CRM-19962
2017-03-10 Eileen McNaughtonMerge pull request #9662 from JMAConsulting/CRM-19792
2017-03-10 Tim OttenMerge pull request #9948 from KarinG/CRM-19966
2017-03-10 Eileen McNaughtonMerge pull request #9860 from JMAConsulting/CRM-20058
2017-03-09 Eileen McNaughtonMerge pull request #9839 from fuzionnz/CRM-20023-geocod...
2017-03-09 Eileen McNaughtonMerge pull request #9957 from civicrm/4.7.17-rc
2017-03-09 colemanwMerge pull request #9769 from scardinius/crm-19958
2017-03-08 Eileen McNaughtonMerge pull request #8807 from JMAConsulting/CRM-16189-4
2017-03-08 Eileen McNaughtonMerge pull request #9947 from davidjosephhayes/master
2017-03-08 Eileen McNaughtonMerge pull request #9946 from lcdservices/CRM-18747
2017-03-08 colemanwMerge pull request #9772 from jitendrapurohit/CRM-4287fix
2017-03-08 colemanwMerge pull request #9912 from fuzionnz/CRM-20200-editor...
2017-02-28 Chris BurgessCRM-20200. Add .editorconfig