Jakob Schrettenbrunner 3a88deb97a Merge branch 'develop' into feature/new-theme ...

# 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

2017-03-03 23:08:24 +01:00

..

src

Merge branch 'develop' into feature/new-theme

2017-03-03 23:08:24 +01:00

editor.js

Update copyright headers

2017-01-24 17:57:08 -05:00

filemanager.min.js

Update filemanager to be a little cleaner

2017-02-17 13:08:07 -05:00

filemanager.min.js.map

Update filemanager to be a little cleaner

2017-02-17 13:08:07 -05:00

upload.js

redesign parts of the file manager

2017-01-27 00:44:59 +01:00