Stack Exchange network consists of 176 Q&A communities including Stack Overflow, the largest, most trusted online community for developers to learn, share their knowledge, and build their careers.
server-client has a wiki and 63 questions, client-server has no wiki and 21 questions. I think that there is no real difference between them and one should be merged into the other (probably the latter into the first).
I kept client-server as the master tag, since it's the more common term. Also, Stack Overflow has the same mapping.
Thanks for bringing this to our attention.