Merge branch 'feature/service-export-import' of https://github.com/Pterodactyl/Panel into feature/service-export-import

This commit is contained in:
Dane Everitt 2017-10-07 23:29:23 -05:00
commit 4d52ba2b39
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 2 additions and 2 deletions

View file

@ -1,5 +1,5 @@
<?php
/**
/*
* Pterodactyl - Panel
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
*

View file

@ -1,5 +1,5 @@
<?php
/**
/*
* Pterodactyl - Panel
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
*