« Previous | Next » 

Revision 6dcf53eb

ID6dcf53eb3e691f464b0e9208ab659d287c8f9d3f

Added by Kostas Papadimitriou over 9 years ago

Merge branch 'latest-quota' into feature-astakos-tables

Conflicts:
snf-astakos-app/astakos/im/models.py
snf-astakos-app/astakos/im/views.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted