include · e484cd3ce04bf933c0498a22dc3049f6e269428a · docker / osticket · GitLab

Snippets Groups Projects

Compare History

Merge remote branch 'upstream-1.7/develop' into develop

Jared Hancock authored 11 years ago

Include changes made just before 1.7.3 release

Conflicts:
	include/ajax.config.php
	include/class.ticket.php

bf956865

Name	Last commit	Last update
..
client
fpdf
i18n
mpdf
pear
staff
upgrader
.htaccess
JSON.php
PasswordHash.php
Spyc.php
ajax.config.php
ajax.content.php
ajax.draft.php
ajax.forms.php
ajax.kbase.php
ajax.reports.php
ajax.tickets.php
ajax.tips.php
ajax.upgrader.php
ajax.users.php
api.cron.php
api.tickets.php
class.ajax.php
class.api.php
class.attachment.php
class.banlist.php
class.canned.php
class.captcha.php
class.category.php
class.client.php
class.config.php
class.cron.php
class.crypto.php
class.csrf.php
class.dept.php
class.dispatcher.php
class.draft.php
class.dynamic_forms.php
class.email.php
class.error.php
class.export.php
class.faq.php
class.file.php
class.filter.php
class.format.php
class.forms.php
class.group.php
class.http.php
class.i18n.php
class.json.php
class.lock.php
class.log.php
class.mailer.php
class.mailfetch.php
class.mailparse.php
class.migrater.php
class.misc.php
class.nav.php
class.orm.php
class.osticket.php
class.ostsession.php
class.page.php
class.pagenate.php
class.passwd.php
class.pdf.php
class.pop3.php
class.priority.php
class.setup.php
class.signal.php
class.sla.php
class.staff.php
class.team.php
class.template.php
class.thread.php
class.ticket.php
class.timezone.php
class.topic.php
class.upgrader.php
class.user.php
class.usersession.php
class.validator.php
class.variable.php
class.xml.php
class.yaml.php
htmLawed.php
html2text.php
index.php
mysql.php
mysqli.php
ost-sampleconfig.php