Merge branch 'release/0.49.2'

loicbdev · Apr 11, 2016 · 4a4846c · 4a4846c
2 parents 81ce126 + 6283837
commit 4a4846c
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 371 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ vendor/*.log
 .rbenv-version
 .ruby-version
 .rvmrc
+*.lock
diff --git a/.travis.yml b/.travis.yml
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# The Internet 0.49.1 (February 22, 2016)
+# The Internet 0.49.2 (April, 11 2016)
 =======
 
 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.49.1 (February 22, 2016)
+# The Internet 0.49.2 (April, 11 2016)
 =======
 
 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.49.1
+0.49.2
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,7 @@
+#0.49.2
++ Added MIT license to project
++ Cleaned up unused configurations for NewRelic and TravisCI
+
 #0.49.0
 + Added /exit_intent example which triggers a modal dialog when the mouse leaves the viewport window
 

diff --git a/config/newrelic.yml b/config/newrelic.yml
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,4 @@ vendor/*.log @@
     .rbenv-version
     .ruby-version
     .rvmrc
+    *.lock