Merge branch 'develop' into feature/vuejs
This commit is contained in:
commit
48cb01f438
52 changed files with 666 additions and 529 deletions
|
@ -3,7 +3,7 @@
|
|||
* Created by PhpStorm.
|
||||
* User: Stan
|
||||
* Date: 26-5-2018
|
||||
* Time: 20:56
|
||||
* Time: 20:56.
|
||||
*/
|
||||
|
||||
namespace Pterodactyl\Traits\Controllers;
|
||||
|
@ -12,13 +12,11 @@ use JavaScript;
|
|||
|
||||
trait PlainJavascriptInjection
|
||||
{
|
||||
|
||||
/**
|
||||
* Injects statistics into javascript
|
||||
* Injects statistics into javascript.
|
||||
*/
|
||||
public function injectJavascript($data)
|
||||
{
|
||||
Javascript::put($data);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue