Revision fd78a867
ID | fd78a8670ae799b5335626c60ff2eb12eed25bf5 |
Parent | 18ffbee1, a70dacde |
Child | 4e30244e |
Merge branch 'master' into 0.5
Conflicts:
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/templates/im/approval_terms.html
Files
- added
- modified
- copied
- renamed
- deleted