amartynov 4e7472de3d Merge branch 'dev' of http://git.stu.neva.ru/cloudtechlab/devops-service into dev ... Conflicts: devops-service/tests/generate_tests.rb		2014-07-15 12:58:41 +04:00
..
features	users tests: create and delete	2014-07-15 12:57:21 +04:00
templates/api_v2	Merge branch 'dev' of http://git.stu.neva.ru/cloudtechlab/devops-service into dev	2014-07-15 12:58:41 +04:00
generate_tests.rb	Merge branch 'dev' of http://git.stu.neva.ru/cloudtechlab/devops-service into dev	2014-07-15 12:58:41 +04:00
params.yml	users tests: create and delete	2014-07-15 12:57:21 +04:00