-
Stavros Sachtouris authored
Conflicts: Changelog docs/conf.py kamaki/cli/commands/cyclades.py kamaki/cli/commands/image.py kamaki/cli/commands/pithos.py setup.py version
81cf516b
Conflicts: Changelog docs/conf.py kamaki/cli/commands/cyclades.py kamaki/cli/commands/image.py kamaki/cli/commands/pithos.py setup.py version