deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2010-07-22 14:16:31 -05:00
commit 1dc14ec2da
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/default.rhtml
View file

@ -30,7 +30,7 @@
</style>
<%= "<style type='text/css'>#{@style_additions}</style>" if @style_additions %>
<style type="text/css"><!--/*--><![CDATA[/*><!--*/
<%= @web ? @web.additional_style.html_safe : '' %>
<%= @web && @web.additional_style ? @web.additional_style.html_safe : '' %>
/*]]>*/--></style>
<%= javascript_include_tag :defaults %>
<%- if @web -%>