Merge branch 'develop' into develop-next (e701ea3f) · Commits · docker / osticket · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

osticket
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

e701ea3f

Commit e701ea3f authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

Merge branch 'develop' into develop-next

parents 83622363 ae844f0d

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

include/class.email.php 1 addition, 1 deletion

include/class.email.php
include/class.format.php 20 additions, 22 deletions

include/class.format.php
include/class.mailer.php 15 additions, 8 deletions

include/class.mailer.php
include/htmLawed.php 1 addition, 1 deletion

include/htmLawed.php
include/html2text.php 1 addition, 1 deletion

include/html2text.php
include/staff/system.inc.php 5 additions, 1 deletion

include/staff/system.inc.php
js/redactor-osticket.js 3 additions, 2 deletions

js/redactor-osticket.js
setup/inc/install-prereq.inc.php 2 additions, 1 deletion

setup/inc/install-prereq.inc.php

with 48 additions and 37 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment