merge default into branch

--HG-- branch : ernie-static-fix-ios-video

merge default into branch
--HG-- branch : ernie-static-fix-ios-video
cf71d90d · Ernie Park · 4661404c · ece5dde5 · cf71d90d · cf71d90d
Commit cf71d90d authored Mar 05, 2012 by Ernie Park
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

css/application.css
+0 -0

css/marketing.css
+0 -0

js/askbot_jquery.min.js
+0 -0

js/html5shiv.js
+2 -0

No files found.
--- a/css/application.css
+++ b/css/application.css
--- a/css/marketing.css
+++ b/css/marketing.css
--- a/js/askbot_jquery.min.js
+++ b/js/askbot_jquery.min.js
--- a/js/html5shiv.js
+++ b/js/html5shiv.js
+../../3rdParty/static/js/html5shiv.js
\ No newline at end of file