Jakob Schrettenbrunner
|
72ac95267b
|
fix some merge fails
|
2017-10-09 21:01:24 +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
|
c979285eb9
|
current state of api & docker env implementation
|
2017-10-01 20:42:17 +02:00 |
|
Dane Everitt
|
256c566dfe
|
Change to using yml for configuration files
|
2017-09-30 17:25:04 -05:00 |
|
Jakob Schrettenbrunner
|
4800c21be4
|
wings cmd: add config flag
|
2017-08-31 23:59:35 +02:00 |
|
Jakob Schrettenbrunner
|
55ec4af875
|
add constants package for constants
|
2017-07-06 20:51:27 +02:00 |
|
Jakob Schrettenbrunner
|
260c9d70ab
|
add official wings ascii logo
|
2017-07-06 19:01:08 +02:00 |
|
Jakob Schrettenbrunner
|
ae41a0e76e
|
move git repo to github.com/Pterodactyl/wings
|
2017-07-01 19:26:05 +02:00 |
|
Jakob Schrettenbrunner
|
50e27db1c4
|
add cobra to implement cli interface for different commands
|
2017-06-29 12:21:59 +02:00 |
|