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

069bef48

Commit 069bef48 authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

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

Include changes from 1.7.1.2

Conflicts:
	main.inc.php

parents 78548148 663acbe4

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

bootstrap.php 18 additions, 18 deletions

bootstrap.php
include/class.crypto.php 49 additions, 8 deletions

include/class.crypto.php
include/class.csrf.php 3 additions, 3 deletions

include/class.csrf.php
include/class.mailfetch.php 3 additions, 4 deletions

include/class.mailfetch.php
include/class.misc.php 0 additions, 20 deletions

include/class.misc.php
include/class.osticket.php 78 additions, 1 deletion

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

include/class.thread.php
include/class.yaml.php 1 addition, 0 deletions

include/class.yaml.php
include/ost-sampleconfig.php 15 additions, 1 deletion

include/ost-sampleconfig.php
include/pear/Crypt/Random.php 0 additions, 249 deletions

include/pear/Crypt/Random.php
include/staff/header.inc.php 1 addition, 1 deletion

include/staff/header.inc.php
setup/cli/package.php 5 additions, 1 deletion

setup/cli/package.php
setup/test/tests/test.crypto.php 9 additions, 0 deletions

setup/test/tests/test.crypto.php

with 187 additions and 306 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