MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-29 03:23:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/new-theme

Browse Source 
# Conflicts:
#	.gitignore
#	public/themes/pterodactyl/js/frontend/files/filemanager.min.js
#	public/themes/pterodactyl/js/frontend/files/filemanager.min.js.map
#	public/themes/pterodactyl/js/frontend/serverlist.js
#	resources/themes/pterodactyl/server/files/list.blade.php
This commit is contained in:
Jakob Schrettenbrunner
2017-03-03 23:08:24 +01:00
parent f6d5ffaebb c021872a9c
commit 3a88deb97a
170 changed files with 9023 additions and 2222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -11,3 +11,4 @@ Vagrantfile
node_modules
yarn.lock
node_modules