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

53478c35

Commit 53478c35 authored Jan 3, 2018 by Gary Allan

Downloads
- Plain Diff

Merge branch 'masterdropdown_ajax' into devel

parents bc3e1867 f7e8b66e

No related branches found

No related tags found

No related merge requests found

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

app/admin/subnets/edit.php 6 additions, 0 deletions

app/admin/subnets/edit.php
app/subnets/mastersubnet-dropdown.php 98 additions, 0 deletions

app/subnets/mastersubnet-dropdown.php
functions/classes/class.Menu.php 178 additions, 0 deletions

functions/classes/class.Menu.php
functions/classes/class.Subnets.php 30 additions, 149 deletions

functions/classes/class.Subnets.php
functions/functions.php 1 addition, 0 deletions

functions/functions.php
js/1.3.1/magic.js 1 addition, 0 deletions

js/1.3.1/magic.js

with 314 additions and 149 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)