diff options
| author | mo khan <mo@mokhan.ca> | 2013-07-22 12:32:22 -0600 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2013-07-22 12:33:39 -0600 |
| commit | 46f5fd46aa5c5397e22d530acbdb1a4a2c2f31f9 (patch) | |
| tree | 63dad6569095f81ea8d55b7d2ad3ebba3cabd089 /app/controllers | |
| parent | b48902691afcbd119d68fa24004cda05c191a667 (diff) | |
| parent | ea7fc20849abc6f516ab7cb78b679c928efe4cac (diff) | |
merge conflict with master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/pages_controller.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb new file mode 100644 index 0000000..a75df60 --- /dev/null +++ b/app/controllers/pages_controller.rb @@ -0,0 +1,3 @@ +class PagesController < HighVoltage::PagesController + layout 'application' +end |