Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolve conflicts and merge | Leif Johansson | 2015-08-11 | 1 | -1/+1 |
| | |||||
* | http://mds.edugain.org into swamid-interfederations-2.0 | Leif Johansson | 2015-06-05 | 1 | -1/+4 |
| | |||||
* | http://mds.edugain.org into swamid-interfederations-2.0 | Fredrik Aslund | 2015-04-01 | 1 | -0/+64 |