Merge branch 'release/0.38.1'

isakib · Dec 8, 2014 · 0578313 · 0578313
2 parents 0ab5c2e + 9ff118c
commit 0578313
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# The Internet 0.38.0 (12-08-2014)
+# The Internet 0.38.1 (12-08-2014)
 =======
 
 An example application that captures prominent and ugly functionality found on the web. Perfect for writing automated acceptance tests against.

diff --git a/README.template b/README.template
@@ -1,4 +1,4 @@
-# The Internet 0.38.0 (12-08-2014)
+# The Internet 0.38.1 (12-08-2014)
 =======
 
 An example application that captures prominent and ugly functionality found on the web. Perfect for writing automated acceptance tests against.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.38.0
+0.38.1
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,7 @@
+#0.38.1
++ Removed pixel specifcation by URL from /shifting_content
++ Reworked the example in /shifting_content so it leverages a menu bar that has a rogue button from time to time
+
 #0.38.0
 + Updated shifting content so it defaults to 10 pixels, but can be changed in the URL by adding a /number (e.g., /shifting_content/100)
 + Added an example for disappearing/reappearing elements on each page load