-
Sofia Papagiannaki authored
Conflicts: snf-astakos-app/Changelog snf-astakos-app/README snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/functions.py snf-astakos-app/astakos/im/settings.py snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js snf-astakos-app/astakos/im/static/im/css/modules.css snf-astakos-app/astakos/im/static/im/js/common.js snf-astakos-app/astakos/im/templates/im/base.html snf-astakos-app/astakos/im/views.py snf-astakos-app/conf/20-snf-astakos-app-settings.conf
a339f0e1