« Previous | Next » 

Revision db0bf47a

IDdb0bf47aef164695b57fcbb0de15f2a1e2ec13eb
Parent b6852727, 4f975958
Child 3cbd5e47

Added by Olga Brani about 9 years ago

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Conflicts:
snf-astakos-app/astakos/im/templatetags/filters.py

Conflicts:
snf-astakos-app/astakos/im/templatetags/filters.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted