Expand templates

From eduroam-TH document
Expand templates