« Previous | Next » 

Revision befa5997

IDbefa59977771f305113a43a4580631d4a21afacd

Added by Giorgos Korfiatis over 8 years ago

Merge branch 'develop' into feature-quotas

Conflicts:
snf-astakos-app/astakos/im/api/service.py
snf-quotaholder-app/quotaholder_django/quotaholder_app/callpoint.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted