History | View | Annotate | Download (3 kB)
merge with master
Merge branch 'master' into aquarium
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...
Removed unused context processor
fix internal astakos menu & minor other changes:
Display menu and use cloudbar processor for cloudbar
Fix loggers webproject entry point
Fixed im static files configuration
Repo refactor and webproject hooks fixes