MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-12 03:13:45 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
799f2ee6d936fd69f514b823aad470df9599381f
panel/resources/lang
History
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
..
en
Merge branch 'develop' into feature/new-theme
2017-03-03 23:08:24 +01:00