developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit 

Conflicts:
	vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb
This commit is contained in:
chris 2012-11-05 11:41:48 +08:00
parent ca3e06c58b 28337c6b5b
commit a5e2c3e0ce
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb vendored
View File

@ -1,5 +1,6 @@
<%= stylesheet_link_tag "font-awesome" %> <%= stylesheet_link_tag "font-awesome" %>
<%= stylesheet_link_tag "bootstrap-responsive" %> <%= stylesheet_link_tag "bootstrap-responsive" %>
<%= stylesheet_link_tag "calendar" %>
<%= javascript_include_tag "cals" %> <%= javascript_include_tag "cals" %>
<link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.9.0/themes/cupertino/jquery-ui.css"> <link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.9.0/themes/cupertino/jquery-ui.css">
<div id="filter" class="subnav"> <div id="filter" class="subnav">