Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolve conflicts and merge | Leif Johansson | 2015-08-11 | 1 | -3/+3 |
|\ | |||||
| * | http://mds.edugain.org into swamid-interfederations-2.0 | Paul Scott | 2015-07-31 | 1 | -14/+12 |
| * | https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=s... | Paul Scott | 2015-07-31 | 1 | -12/+14 |
* | | http://mds.edugain.org into swamid-interfederations-2.0 | Leif Johansson | 2015-07-23 | 1 | -14/+12 |
* | | https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=s... | Leif Johansson | 2015-07-23 | 1 | -12/+14 |
|/ | |||||
* | http://mds.edugain.org into swamid-interfederations-2.0 | Leif Johansson | 2015-07-09 | 1 | -14/+12 |
* | https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=s... | Leif Johansson | 2015-07-09 | 1 | -12/+14 |
* | http://mds.edugain.org into swamid-interfederations-2.0 | Leif Johansson | 2015-07-09 | 1 | -14/+12 |
* | https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=s... | Leif Johansson | 2015-07-09 | 1 | -0/+83 |