Private GIT

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

phpipam
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

b0ea28e7

Unverified Commit b0ea28e7 authored 1 year ago by Miha Petkovsek Committed by GitHub 1 year ago

Downloads
- Plain Diff

Merge branch 'master' into passkeys

parents 99967b58 6406483e

No related branches found

No related tags found

No related merge requests found

Changes 12

Show whitespace changes

Inline Side-by-side

Showing

.gitmodules 4 additions, 0 deletions

.gitmodules
README.md 4 additions, 2 deletions

README.md
app/admin/devices/edit-result.php 13 additions, 11 deletions

app/admin/devices/edit-result.php
app/admin/devices/edit.php 13 additions, 12 deletions

app/admin/devices/edit.php
config.dist.php 15 additions, 1 deletion

config.dist.php
config.docker.php 22 additions, 0 deletions

config.docker.php
functions/checks/check_php_build.php 2 additions, 2 deletions

functions/checks/check_php_build.php
functions/classes/class.Common.php 33 additions, 31 deletions

functions/classes/class.Common.php
functions/classes/class.User.php 1 addition, 2 deletions

functions/classes/class.User.php
functions/global_functions.php 0 additions, 83 deletions

functions/global_functions.php
functions/version.php 1 addition, 1 deletion

functions/version.php
misc/CHANGELOG 2 additions, 1 deletion

misc/CHANGELOG

with 110 additions and 146 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

Another place to be (or not)