Merge remote branch 'upstream/develop' into develop-next (9596cf3a) · 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

9596cf3a

Commit 9596cf3a authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

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

Conflicts:
	include/staff/templates/user-lookup.tmpl.php

parents 45cb100f 2f71c968

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

include/mysqli.php 6 additions, 0 deletions

include/mysqli.php
include/staff/templates/user-lookup.tmpl.php 1 addition, 1 deletion

include/staff/templates/user-lookup.tmpl.php
setup/inc/class.installer.php 1 addition, 0 deletions

setup/inc/class.installer.php
setup/test/tests/test.jslint.php 25 additions, 0 deletions

setup/test/tests/test.jslint.php

with 33 additions and 1 deletion

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