Revision 67cd4980
| ID | 67cd49808ba341fde2ffd8932f5d3be5876fc6e3 |
Merge remote-tracking branch 'origin/develop' into feature-branding
Conflicts:
snf-astakos-app/astakos/im/templates/im/footer.html
snf-cyclades-app/setup.py
Files
- added
- modified
- copied
- renamed
- deleted