From 1d91a7996a5ade0915cd340c5726baa3c0986e04 Mon Sep 17 00:00:00 2001 From: Alex Xu Date: Sun, 16 Mar 2014 11:50:06 -0400 Subject: Merge branch 'master' of happinessforme.com:html5ks Conflicts: Makefile Modernizr --- Modernizr | 2 +- spin.js | 2 +- when | 2 +- www/warned.html | 15 ++++++++++----- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Modernizr b/Modernizr index 1a7d746..7ea2b19 160000 --- a/Modernizr +++ b/Modernizr @@ -1 +1 @@ -Subproject commit 1a7d74663f3edf0770a2146b934217fd7a543829 +Subproject commit 7ea2b19a6ad3e97c7649aabe75a823d55be48c99 diff --git a/spin.js b/spin.js index 7c0fde9..0271cbb 160000 --- a/spin.js +++ b/spin.js @@ -1 +1 @@ -Subproject commit 7c0fde992df65b66e097e4bab6c2f8474bf3080d +Subproject commit 0271cbb28ac9a4be3910df937a586380ec25235e diff --git a/when b/when index 3697fc0..42074c7 160000 --- a/when +++ b/when @@ -1 +1 @@ -Subproject commit 3697fc000435c9d9377f8329d7641f8f6d8cbfdf +Subproject commit 42074c715039af32950c3dbcf144e403660d415b diff --git a/www/warned.html b/www/warned.html index 99779ed..e3daf67 100644 --- a/www/warned.html +++ b/www/warned.html @@ -1,11 +1,16 @@ - - -If you're seeing this, something's gone wrong. Go back and report a bug. +If you're seeing this, something's gone wrong. Go back and try again, and if it still doesn't work, file a bug. -- cgit v1.2.3-54-g00ecf