« Previous | Next » 

Revision 460b907d

ID460b907d25f6d9c292fb8c33506d31f616e80bef

Added by Kostas Papadimitriou about 8 years ago

Merge branch 'develop' into feature-projects-ux

Conflicts:
snf-astakos-app/astakos/im/templates/im/projects/intro.html
snf-astakos-app/astakos/im/templatetags/astakos_tags.py
snf-astakos-app/astakos/im/urls.py
snf-astakos-app/astakos/im/views.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted