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

f25ccd74

Commit f25ccd74 authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

Merge branch 'develop' into develop-next

Conflicts:
	include/class.cron.php

parents 0298b949 31bb4ac0

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

include/ajax.tickets.php 3 additions, 3 deletions

include/ajax.tickets.php
include/class.cron.php 45 additions, 1 deletion

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

include/class.dynamic_forms.php
include/class.lock.php 1 addition, 2 deletions

include/class.lock.php
include/class.osticket.php 3 additions, 4 deletions

include/class.osticket.php
include/class.ostsession.php 5 additions, 0 deletions

include/class.ostsession.php
include/class.ticket.php 1 addition, 5 deletions

include/class.ticket.php
include/class.usersession.php 17 additions, 2 deletions

include/class.usersession.php
scp/ajax.php 1 addition, 0 deletions

scp/ajax.php
scp/autocron.php 1 addition, 0 deletions

scp/autocron.php
scp/staff.inc.php 3 additions, 1 deletion

scp/staff.inc.php

with 83 additions and 20 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