swamid-metadata.git - The metadata of the SWAMID federation

	Commit message (Collapse)	Author	Age	Files	Lines
*	resolve conflicts and merge	Leif Johansson	2015-08-11	1	-5/+0
\|\
\| *	http://metadata.ukfederation.org.uk/ukfederation-export.xml into ↵	Paul Scott	2015-07-31	1	-46/+49
\| \| \| \| \| \| \| \|	swamid-interfederations-2.0
\| *	http://mds.edugain.org into swamid-interfederations-2.0	Paul Scott	2015-07-31	1	-49/+46
\| \|
* \|	http://metadata.ukfederation.org.uk/ukfederation-export.xml into ↵	Leif Johansson	2015-07-23	1	-46/+49
\| \| \| \| \| \| \| \|	swamid-interfederations-2.0
* \|	http://mds.edugain.org into swamid-interfederations-2.0	Leif Johansson	2015-07-23	1	-49/+46
\|/
*	http://metadata.ukfederation.org.uk/ukfederation-export.xml into ↵	Leif Johansson	2015-07-09	1	-46/+49
\| \| \| \|	swamid-interfederations-2.0
*	http://mds.edugain.org into swamid-interfederations-2.0	Leif Johansson	2015-07-09	1	-49/+46
\|
*	http://metadata.ukfederation.org.uk/ukfederation-export.xml into ↵	Leif Johansson	2015-07-09	1	-46/+49
\| \| \| \|	swamid-interfederations-2.0
*	http://mds.edugain.org into swamid-interfederations-2.0	Leif Johansson	2015-07-09	1	-49/+46
\|
*	http://metadata.ukfederation.org.uk/ukfederation-export.xml into ↵	Leif Johansson	2015-07-09	1	-46/+49
\| \| \| \|	swamid-interfederations-2.0
*	http://mds.edugain.org into swamid-interfederations-2.0	Leif Johansson	2015-07-09	1	-49/+46
\|
*	http://metadata.ukfederation.org.uk/ukfederation-export.xml into ↵	Leif Johansson	2015-07-09	1	-46/+49
\| \| \| \|	swamid-interfederations-2.0
*	http://mds.edugain.org into swamid-interfederations-2.0	Leif Johansson	2015-07-09	1	-0/+105