Revision d62295ba
| ID | d62295bab72a3ef37b6b5a43ff26bc895b90edfc |
Merge branch 'projects' of https://code.grnet.gr/git/astakos into latest-quota
Conflicts:
.gitignore
snf-astakos-app/conf/20-snf-astakos-app-settings.conf
Files
- added
- modified
- copied
- renamed
- deleted