diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-17 14:04:58 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-17 14:04:58 +0100 |
| commit | a4927fc05a710cee6217d8a40ce925d5f894fd8f (patch) | |
| tree | 83909e1d903afbf49d50182af79a679442632975 /app/views/general/_stylesheet_includes.rhtml | |
| parent | cc27fe66a13fe1504711c64ce5530a1c178e907d (diff) | |
| parent | cc7bc36d5748c9baa0cfd8e44395923cc5792f32 (diff) | |
Merge branch 'release/0.6.7' into wdtk
Conflicts:
config/general.yml-example
Diffstat (limited to 'app/views/general/_stylesheet_includes.rhtml')
| -rw-r--r-- | app/views/general/_stylesheet_includes.rhtml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/general/_stylesheet_includes.rhtml b/app/views/general/_stylesheet_includes.rhtml index 2ffa5dadf..7a03680f8 100644 --- a/app/views/general/_stylesheet_includes.rhtml +++ b/app/views/general/_stylesheet_includes.rhtml @@ -16,6 +16,6 @@ <![endif]--> <!-- the following method for customising CSS is deprecated; see `doc/THEMES.md` for detail --> <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet" %> - <% if force_registration_on_new_request %> + <% if Configuration::force_registration_on_new_request %> <%= stylesheet_link_tag 'jquery.fancybox-1.3.4', :rel => "stylesheet" %> <% end %> |