« Previous | Next » 

Revision bdd76c50

IDbdd76c507d7c8b45a37443d7b187cc50ef928cf2
Parent 9f663ff7, 1b866d9e
Child 24976f0d

Added by Sofia Papagiannaki over 9 years ago

Merge branch '0.6.4' into future

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted