Merge remote branch 'upstream-1.7/develop' into develop (78548148) · 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

78548148

Commit 78548148 authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

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

Include changes in 1.7.1.1

Conflicts:
	main.inc.php

parents 4df06d1b 7aa4e6f8

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

bootstrap.php 7 additions, 16 deletions

bootstrap.php
client.inc.php 1 addition, 1 deletion

client.inc.php
include/api.tickets.php 3 additions, 2 deletions

include/api.tickets.php
include/class.api.php 4 additions, 2 deletions

include/class.api.php
include/class.captcha.php 2 additions, 2 deletions

include/class.captcha.php
include/class.file.php 19 additions, 17 deletions

include/class.file.php
include/class.mailfetch.php 1 addition, 0 deletions

include/class.mailfetch.php
include/class.mailparse.php 5 additions, 0 deletions

include/class.mailparse.php
include/class.misc.php 17 additions, 14 deletions

include/class.misc.php
include/class.ostsession.php 26 additions, 13 deletions

include/class.ostsession.php
include/class.staff.php 1 addition, 1 deletion

include/class.staff.php
include/ost-sampleconfig.php 1 addition, 1 deletion

include/ost-sampleconfig.php
setup/cli/package.php 1 addition, 1 deletion

setup/cli/package.php

with 88 additions and 70 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