Skip to content
GitLab
Explore
Sign in
itminedu
synnefo
Repository
synnefo
snf-common
synnefo
lib
astakos.py
Find file
Blame
History
Permalink
Merge branch 'devel-0.11' into ui-0.11
· 5adf20a8
Kostas Papadimitriou
authored
Sep 17, 2012
Conflicts: snf-common/synnefo/lib/astakos.py snf-cyclades-app/synnefo/ui/static/snf/js/models.js
5adf20a8