Commit 8aadc62

authored

Merge branch 'develop' into feature/node-maintenance

2 parents ccf3e35 + 357c9e1 commit 8aadc62Copy full SHA for 8aadc62

6 files changed

+190

-154

lines changed

composer.lock
public/themes/pterodactyl/js/frontend/files
resources/themes/pterodactyl
- layouts
  - master.blade.php
- server/files
  - edit.blade.php

+190

-154

lines changed

Comments

(0)