-
https://code.grnet.gr/git/astakosOlga Brani authored
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
46b08a57
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