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

0be4fb97

Commit 0be4fb97 authored 10 years ago by Jared Hancock

Downloads
- Plain Diff

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

Conflicts:
	include/class.list.php

parents 7449461d 1a2e3d80

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

include/class.csrf.php 7 additions, 4 deletions

include/class.csrf.php
include/class.dynamic_forms.php 33 additions, 9 deletions

include/class.dynamic_forms.php
include/class.forms.php 0 additions, 30 deletions

include/class.forms.php
include/class.list.php 9 additions, 0 deletions

include/class.list.php
include/staff/header.inc.php 1 addition, 1 deletion

include/staff/header.inc.php
login.php 14 additions, 0 deletions

login.php
scp/login.php 10 additions, 0 deletions

scp/login.php

with 74 additions and 44 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