Skip to content
Commit e218ec2b authored by Marcel's avatar Marcel
Browse files

Merge branch 'xMAC94x/fix_torvus_and_other_client_only' into 'master' 

move ship_manifest to common assets until its properly included in servers ECS...

See merge request !3009
parents dd526959 cd516d09
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment