Skip to content
  • Alex Vandiver's avatar
    Merge branch '4.0-trunk' into 4.2-trunk · 1f4a0bc7
    Alex Vandiver authored
    Conflicts:
    	lib/RT/Config.pm
    	lib/RT/Handle.pm
    	share/html/Elements/EditCustomFieldAutocomplete
    	share/html/Elements/EditCustomFieldDateTime
    	share/html/Elements/EditCustomFieldFreeform
    	share/html/Elements/EditCustomFieldSelect
    	share/html/Elements/EditCustomFieldText
    	share/html/Elements/EditCustomFieldWikitext
    	share/html/Elements/ShowLink
    	share/html/Elements/SimpleSearch
    	share/html/Search/Bulk.html
    	share/static/js/cascaded.js
    	t/validator/group_members.t
    1f4a0bc7