Dmitriy Zaporozhets cbd78922ee Merge branch 'deploy_keys' ... Conflicts: app/views/layouts/project.html.haml db/schema.rb		2012-01-14 21:26:35 +02:00
..
_form.html.haml	DeployKey moved to Key model	2011-12-31 16:24:10 +02:00
_show.html.haml	Path correction	2011-12-29 23:31:27 +02:00
create.js.haml	Initial deploy_key feature commit	2011-12-29 21:44:16 +02:00
edit.html.haml	Initial deploy_key feature commit	2011-12-29 21:44:16 +02:00
index.html.haml	Merge branch 'deploy_keys'	2012-01-14 21:26:35 +02:00
new.html.haml	Initial deploy_key feature commit	2011-12-29 21:44:16 +02:00
new.js.haml	Initial deploy_key feature commit	2011-12-29 21:44:16 +02:00
show.html.haml	Path correction	2011-12-29 23:31:27 +02:00