Merge branch 'design_team' into ldap

This commit is contained in:
Christophe Vilayphiou committed 2012-04-25 15:10:50 +08:00
commit 8adb9c6878
3 files changed
+4 -5

No files matched your search

+2 -2
View File
@@ -3,10 +3,10 @@
<% end %>
<% content_for :page_specific_javascript do %>
<%= javascript_include_tag "lib/datepicker" %>
<%= javascript_include_tag "lib/date.format" %>
<%= javascript_include_tag "lib/date.format.js" %>
<%= javascript_include_tag "inc/modal-preview" %>
<%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
<%= javascript_include_tag "inc/jquery.imagesloaded" %>
<%= javascript_include_tag "inc/jquery.imagesloaded.js" %>
<% end %>