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
..
10_script.feature.erb	added delete script template	2014-07-15 12:22:51 +04:00
90_user.feature	users tests: create and delete	2014-07-15 12:57:21 +04:00