« Previous | Next » 

Revision 39cd6c92

ID39cd6c9281cccb24b490f1f120ff58e113f2da70
Parent a2436cb6, 789bcaf9
Child 1b3db4f0

Added by Sofia Papagiannaki over 11 years ago

Merge branch '0.6.4' into dev

Conflicts:
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/views.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted