Evgeniy L 05b9819f1f Merge remote-tracking branch 'origin/master' into deployment-2 ... Conflicts: example.py resources/mariadb_service/actions/run.yml		2015-06-03 10:41:16 +02:00
..
solar	Merge remote-tracking branch 'origin/master' into deployment-2	2015-06-03 10:41:16 +02:00
MANIFEST.in	Restored removed files after the latest merge	2015-05-14 10:56:18 +02:00
requirements.txt	Added jsonschema in requirements	2015-05-28 13:31:11 +02:00
setup.py	Restored removed files after the latest merge	2015-05-14 10:56:18 +02:00