Revision 85c6267a
ID | 85c6267aa94d53e3ebd3c61ecd39178bfc33b598 |
Merge branch 'api-current' into helpdesk-gui
Conflicts:
aai/shibboleth.py
Files
- added
- modified
- copied
- renamed
- deleted
ID | 85c6267aa94d53e3ebd3c61ecd39178bfc33b598 |
Added by Giorgos Gousios over 12 years ago
Merge branch 'api-current' into helpdesk-gui
Conflicts:
aai/shibboleth.py