Revision c3a00daf
ID | c3a00daf86d9a5bb461d8bb33f8998aea3ea2913 |
Parent | 5056da3d, 1eaeb5b6 |
Child | ec7778db, 4de59eac |
:Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Conflicts:
snf-astakos-app/astakos/im/templates/im/billing.html
snf-astakos-app/astakos/im/templatetags/filters.py
snf-astakos-app/astakos/im/views.py
Files
- added
- modified
- copied
- renamed
- deleted