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

5c676b43

Commit 5c676b43 authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

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

Conflicts:
	include/class.http.php
	include/mysqli.php

parents bb1a30b2 da3d53a8

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

include/class.http.php 7 additions, 2 deletions

include/class.http.php
include/class.thread.php 1 addition, 1 deletion

include/class.thread.php
include/mysqli.php 12 additions, 6 deletions

include/mysqli.php
include/upgrader/streams/core/c00511c7-7be60a84.patch.sql 1 addition, 1 deletion

include/upgrader/streams/core/c00511c7-7be60a84.patch.sql
setup/inc/class.installer.php 1 addition, 3 deletions

setup/inc/class.installer.php

with 22 additions and 13 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