Skip to content

Commit

Permalink
Merge branch 'master' into openstack-os-build
Browse files Browse the repository at this point in the history
  • Loading branch information
@VictorLowther
VictorLowther committed Mar 16, 2012
2 parents 3f37e86 + 230f84a commit 6d39e91
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion barclamps/crowbar
Submodule crowbar updated 5 files
+1 −0 crowbar.yml
+22 −6 crowbar_framework/app/controllers/support_controller.rb
+81 −8 crowbar_framework/app/views/support/import.html.haml
+5 −1 crowbar_framework/config/locales/en.yml
+ − crowbar_framework/public/images/icons/help.png

0 comments on commit 6d39e91

Please sign in to comment.