« Previous | Next » 

Revision 67cd4980

ID67cd49808ba341fde2ffd8932f5d3be5876fc6e3

Added by Kostas Papadimitriou over 8 years ago

Merge remote-tracking branch 'origin/develop' into feature-branding

Conflicts:
snf-astakos-app/astakos/im/templates/im/footer.html
snf-cyclades-app/setup.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted