Revision 1b3db4f0
ID | 1b3db4f03a1ba1475499fb684fd4cf607d065a98 |
Parent | 476fdba1, 39cd6c92 |
Child | 574264f8 |
Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
Conflicts:
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/views.py
Files
- added
- modified
- copied
- renamed
- deleted