Skip to content
  • Alex Vandiver's avatar
    Merge branch '4.0-trunk' into 4.2-trunk · 80bcdcfd
    Alex Vandiver authored
    This removes the preferences caching introduced in 4.2 in ddfeca8e,
    replacing it with that of 4.0 from a273c51b and 5b707dfe.  It also
    reolves a number of conflicts brought about by 4.0/utf8-reckoning and
    its 4.2 counterpart.
    
    Conflicts:
    	lib/RT/Action/SendEmail.pm
    	lib/RT/Attachment.pm
    	lib/RT/Crypt/GnuPG.pm
    	lib/RT/Dashboard/Mailer.pm
    	lib/RT/I18N.pm
    	lib/RT/I18N/fr.pm
    	lib/RT/Interface/Email.pm
    	lib/RT/Interface/Email/Auth/Crypt.pm
    	lib/RT/Interface/Web.pm
    	lib/RT/Record.pm
    	lib/RT/Template.pm
    	lib/RT/Ticket.pm
    	lib/RT/Tickets.pm
    	lib/RT/User.pm
    	sbin/rt-test-dependencies.in
    	share/html/Admin/Users/Modify.html
    	share/html/Elements/EditCustomFieldDate
    	share/html/Elements/EditCustomFieldDateTime
    	share/html/NoAuth/css/aileron/ticket.css
    	share/html/NoAuth/css/base/ticket.css
    	share/html/Search/Results.tsv
    	share/html/Ticket/Create.html
    	share/html/Ticket/Elements/EditTransactionCustomFields
    	share/html/Ticket/Elements/PreviewScrips
    	share/html/Ticket/Update.html
    	share/html/Tools/Offline.html
    	t/api/i18n_guess.t
    	t/mail/dashboard-chart-with-utf8.t
    	t/mail/header-characters.t
    	t/mail/sendmail.t
    	t/web/offline_messages_utf8.t
    	t/web/offline_utf8.t
    	t/web/user_update.t
    80bcdcfd