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

c212d817

Commit c212d817 authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

Merge branch 'develop' into develop-next

Conflicts:
	include/class.usersession.php

parents 60560e86 398cbc7d

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

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

include/api.tickets.php
include/class.api.php 1 addition, 1 deletion

include/class.api.php
include/class.mailfetch.php 17 additions, 0 deletions

include/class.mailfetch.php
include/class.mailparse.php 17 additions, 4 deletions

include/class.mailparse.php
include/class.usersession.php 1 addition, 0 deletions

include/class.usersession.php

with 39 additions and 7 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