StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/admin-retheme

Browse source 
# Conflicts:
#	public/themes/pterodactyl/css/pterodactyl.css
This commit is contained in:
Dane Everitt 2017-03-03 17:35:04 -05:00
commit 799f2ee6d9
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
22 changed files with 10923 additions and 528 deletions
Download patch file Download diff file Expand all files Collapse all files

10220
public/themes/pterodactyl/vendor/jquery/jquery.js vendored Normal file
View file

File diff suppressed because it is too large Load diff

4
public/themes/pterodactyl/vendor/jquery/jquery.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

1
public/themes/pterodactyl/vendor/jquery/jquery.min.map vendored Normal file
View file

File diff suppressed because one or more lines are too long