Skip to content

Commit d96aff3

Browse files
DaneEverittDaneEveritt
committed
Merge pull request pterodactyl#64 from Pterodactyl/v0.3.0-beta
merge v0.3.0 into development
2 parents fb1eef2 + 84a7eec commit d96aff3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2265
-658
lines changed

‎.env.example‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ APP_ENV=production
22
APP_DEBUG=false
33
APP_KEY=SomeRandomString3232RandomString
44
APP_THEME=default
5+
APP_TIMEZONE=UTC
56

67
DB_HOST=localhost
78
DB_PORT=3306

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ SOFTWARE.
3030
### Credits
3131
Animate.css - [license](https://github.com/daneden/animate.css/blob/master/LICENSE) - [homepage](http://daneden.github.io/animate.css/)
3232

33+
Async.js - [license](https://github.com/caolan/async/blob/master/LICENSE) - [homepage](https://github.com/caolan/async/)
34+
3335
BinaryJS - [license](https://github.com/binaryjs/binaryjs/blob/master/LICENSE) - [homepage](http://binaryjs.com)
3436

3537
Bootstrap - [license](https://github.com/twbs/bootstrap/blob/master/LICENSE) - [homepage](http://getbootstrap.com)

‎app/Http/Controllers/Admin/AccountsController.php‎

Lines changed: 0 additions & 145 deletions
This file was deleted.

0 commit comments

Comments
 (0)