Merge remote branch 'upstream/develop' into develop-next (8cfb6f40) · 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

8cfb6f40

Commit 8cfb6f40 authored 10 years ago by Jared Hancock

Downloads
- Plain Diff

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

Conflicts:
	include/class.dynamic_forms.php

parents d2261401 06f2a7e7

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

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

include/class.company.php
include/class.dynamic_forms.php 11 additions, 1 deletion

include/class.dynamic_forms.php
include/class.forms.php 3 additions, 2 deletions

include/class.forms.php
include/class.mailer.php 13 additions, 1 deletion

include/class.mailer.php
include/class.mailparse.php 30 additions, 16 deletions

include/class.mailparse.php
include/class.signal.php 2 additions, 2 deletions

include/class.signal.php
include/client/edit.inc.php 1 addition, 1 deletion

include/client/edit.inc.php
include/client/tickets.inc.php 1 addition, 1 deletion

include/client/tickets.inc.php
include/staff/pwreset.login.php 1 addition, 1 deletion

include/staff/pwreset.login.php
include/staff/tickets.inc.php 1 addition, 1 deletion

include/staff/tickets.inc.php
setup/test/run-tests.php 5 additions, 0 deletions

setup/test/run-tests.php
setup/test/tests/test.header_functions.php 112 additions, 0 deletions

setup/test/tests/test.header_functions.php

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