# Conflicts: # app/Http/Controllers/ServerController.php # composer.lock # resources/lang/de.json # resources/lang/en.json # resources/views/servers/index.blade.php |
||
---|---|---|
.. | ||
api.php | ||
channels.php | ||
console.php | ||
web.php |
# Conflicts: # app/Http/Controllers/ServerController.php # composer.lock # resources/lang/de.json # resources/lang/en.json # resources/views/servers/index.blade.php |
||
---|---|---|
.. | ||
api.php | ||
channels.php | ||
console.php | ||
web.php |