« Previous | Next » 

Revision f366e3ed

IDf366e3ed099525a398b047d3f7bcba2eb381f778
Parent c0b26605, df7fa2b8
Child 8a0590b2

Added by Olga Brani over 9 years ago

Merge branch '0.6.4' into devel-0.13

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted