A definite mix. In addition to all the pre war stuff, like MAS 36, MAS 38 FM 24/29 etc, some of which continued to be manufactured there was a substantial stock of US surplus from the US equipped Free French divisions.
A great time to do a French Army, not only can you field a few Panthers, which the French reconditioned from captured war booty but you can field the ARL 44 one of the ugliest tanks ever conceived ( imagine a Char B1 with a modernish turret and incredibly long gun barrel).
Onl;y people who make French in m47 uniforms that I can think of are Eureka. Lovely figures but teh range is 15mm. I've tried petitioning them and interesting Nic in doing a range in 28mm, there may even be a 100 club entry out there.