diff options
author | Mark Longair <mhl@pobox.com> | 2013-12-05 10:30:05 +0000 |
---|---|---|
committer | Mark Longair <mhl@pobox.com> | 2013-12-05 10:30:05 +0000 |
commit | 985abf16bed94092e4cd206352253eabe85a55d1 (patch) | |
tree | 6ca025dc16dafde5522cb8fe0bafb59d2e6b25c8 /lib/tasks/themes.rake | |
parent | d35b7fec9ad723496c95791ae314964f4d3360dd (diff) | |
parent | 2bc00ec896b955ba87faf2c051517d26635f80a3 (diff) |
Merge branch 'feature/switch-theme-none-option' into rails-3-develop
Conflicts:
script/switch-theme.rb
Diffstat (limited to 'lib/tasks/themes.rake')
0 files changed, 0 insertions, 0 deletions