• Sofia Papagiannaki's avatar
    Merge branch 'master' into aquarium · 067961d3
    Sofia Papagiannaki authored
    Conflicts:
    	snf-astakos-app/Changelog
    	snf-astakos-app/README
    	snf-astakos-app/astakos/im/api.py
    	snf-astakos-app/astakos/im/backends.py
    	snf-astakos-app/astakos/im/context_processors.py
    	snf-astakos-app/astakos/im/functions.py
    	snf-astakos-app/astakos/im/management/commands/sendactivation.py
    	snf-astakos-app/astakos/im/models.py
    	snf-astakos-app/astakos/im/settings.py
    	snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.css
    	snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.less
    	snf-astakos-app/astakos/im/static/im/css/styles.css
    	snf-astakos-app/astakos/im/static/im/css/styles.less
    	snf-astakos-app/astakos/im/templates/im/login.html
    	snf-astakos-app/astakos/im/views.py
    067961d3
settings.py 3.04 KB