dellcloudedge/barclamp-crowbar — pull request #177 by galthaus (2012-08-31 02:34:43+00:00)
Title: Merge rails3anddb to development [1/6]

.../app/controllers/application_controller.rb | 1 +
crowbar_framework/app/models/user.rb | 10 +-
.../app/views/layouts/application.html.haml | 7 +
crowbar_framework/config/locales/crowbar/en.yml | 1 +
crowbar_framework/config/routes.rb | 2 +-
.../migrate/20120801153900_devise_create_users.rb | 6 +-
crowbar_framework/doc/crowbar.yml | 2 +
.../doc/default/crowbar/devguide/api/network.md | 158 ++++++++++++++++++++
8 files changed, 180 insertions(+), 7 deletions(-)