Merge branch 'develop' into develop-next (ddf6c9b6) · 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

ddf6c9b6

Commit ddf6c9b6 authored 11 years ago by Peter Rotich

Downloads
- Plain Diff

Merge branch 'develop' into develop-next

Conflicts:
	include/class.mailparse.php

parents 48622444 1d75aeb2

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

include/class.email.php 3 additions, 3 deletions

include/class.email.php
include/class.mailparse.php 23 additions, 19 deletions

include/class.mailparse.php
js/redactor.min.js 1 addition, 1 deletion

js/redactor.min.js
setup/test/tests/test.jslint.php 0 additions, 1 deletion

setup/test/tests/test.jslint.php

with 27 additions and 24 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