Statistics
| Branch: | Tag: | Revision:

root / snf-astakos-app / astakos / im / api / backends / notifications.py @ 5e992f29

History | View | Annotate | Download (3.2 kB)

# Date Author Comment
c0b26605 11/29/2012 05:08 pm Sofia Papagiannaki

Merge remote-tracking branch 'origin/0.12' into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/activation_backends.py
snf-astakos-app/astakos/im/api/admin.py
snf-astakos-app/astakos/im/auth_backends.py
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/functions.py...
29b87e7c 11/08/2012 05:53 pm Sofia Papagiannaki

Fix group creation summary view