« Previous | Next » 

Revision 2df3770c

ID2df3770c506ed65176102ebb3b556f991240cca3

Added by Kostas Papadimitriou over 9 years ago

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

Conflicts:
snf-astakos-app/astakos/im/templates/im/projects/project_list.html
snf-astakos-app/astakos/im/views.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted