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

DaneEveritt · DaneEveritt · commit 4d52ba2b39f4 · 2017-10-07T23:29:23.000-05:00
diff --git a/routes/api-admin.php b/routes/api-admin.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  * Pterodactyl - Panel
  * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
  *
diff --git a/routes/api.php b/routes/api.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  * Pterodactyl - Panel
  * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
  *

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<?php`
`2`		`-/**`
	`2`	`+/*`
`3`	`3`	`* Pterodactyl - Panel`
`4`	`4`	`* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.`
`5`	`5`	`*`