Revision 4baa5660
| ID | 4baa56608a87bcbbfec7aa419b5eb48050618912 |
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
Conflicts:
snf-astakos-app/astakos/im/templates/im/auth/local_login_prompt.html
Files
- added
- modified
- copied
- renamed
- deleted