Skip to content

Commit

Permalink
Merge branch 'jquery-1.5.2' of https://github.com/stewart/rstat.us in…
Browse files Browse the repository at this point in the history
…to stewart-jquery-1.5.2
  • Loading branch information
steveklabnik committed Apr 2, 2011
2 parents 96cf8ef + c65e320 commit 982fbf1
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
16 changes: 16 additions & 0 deletions public/js/lib/jquery-1.5.2.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/_head.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%head
%meta{:charset => "utf-8"}
%title= locals[:title].nil? ? "rstat.us": "rstat.us - #{locals[:title]}"
%script{:src=>"https://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"}
%script{:src => "/js/lib/jquery-1.5.2.min.js"}

-if @author
%link{:rel => "alternate", :type => "application/atom+xml",
Expand Down

0 comments on commit 982fbf1

Please sign in to comment.