Revision f38084ce
| ID | f38084ce0c4e77fd8a82f7496ec5872258536b80 |
Merge remote-tracking branch 'synnefo/feature-astakos-tables' into feature-astakos-tables
Conflicts:
snf-astakos-app/astakos/im/tables.py
Files
- added
- modified
- copied
- renamed
- deleted
| ID | f38084ce0c4e77fd8a82f7496ec5872258536b80 |
Added by Kostas Papadimitriou over 11 years ago
Merge remote-tracking branch 'synnefo/feature-astakos-tables' into feature-astakos-tables
Conflicts:
snf-astakos-app/astakos/im/tables.py