« Previous | Next » 

Revision 53ece625

ID53ece6258cc34546a8247ab199d4c89ce17e7c2a
Parent df4c7b3c, b9b71797
Child c3330991

Added by Sofia Papagiannaki over 9 years ago

Merge branch 'aquarium', remote-tracking branch 'origin'

Conflicts:
snf-astakos-app/astakos/im/settings.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted