Commit Graph

12 Commits

Author SHA1 Message Date
Jakob Schrettenbrunner
27b397c712 fix environment_docker_test data path 2018-04-01 23:41:45 +02:00
Jakob Schrettenbrunner
44f42eec8c Merge branch 'develop' of github.com:Pterodactyl/wings into develop
# Conflicts:
#	api/api.go
#	api/core_routes.go
#	api/handlers_server.go
#	api/routes_server.go
#	config.example.json
#	utils/logging.go
2017-10-01 20:59:32 +02:00
Jakob Schrettenbrunner
e17d96d094 update gitignore 2017-10-01 20:39:48 +02:00
Dane Everitt
256c566dfe
Change to using yml for configuration files 2017-09-30 17:25:04 -05:00
Jakob Schrettenbrunner
09d2d6ec4a gitignore: ignore built wings executable 2017-08-31 23:59:06 +02:00
Jakob Schrettenbrunner
a2af38f03e replace dep with glide 2017-06-27 12:43:55 +02:00
Jakob Schrettenbrunner
ceeabd6cbc add cross platform build to travis
auto deploy on releases with travis
2017-06-27 10:03:17 +02:00
Jakob Schrettenbrunner
f38d2996e9 add vagrant setup 2017-06-21 00:42:14 +02:00
Jakob Schrettenbrunner
18b7b30057 remove all variants of /vendor folder 2017-06-21 00:41:15 +02:00
Jakob Schrettenbrunner
03acc4d5a3 add full config struct 2017-06-19 16:15:28 +02:00
Jakob Schrettenbrunner
69d95c6fbf add editorconfig and gitignore 2017-06-18 23:59:30 +02:00
Jakob
e0561c52fb Initial commit 2017-05-17 12:49:29 +02:00