Xavier Guimard b23595a5e2 Save conflict		2016-01-14 10:17:12 +00:00
..
en.json	Change oidcOPMetaDataOptionsDisplay node name (#820)	2016-01-07 10:49:55 +00:00
fr.json	Save conflict	2016-01-14 10:17:12 +00:00