From 38ee2f5faf88bedab11ac969c9624508338326ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 1 Jun 2014 13:50:03 +0200
Subject: [PATCH] bump uglifier

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index f93f4acbd..a7231e0d5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -125,7 +125,7 @@ group :assets do
 
   # Compression
 
-  gem 'uglifier', '2.1.2'
+  gem 'uglifier', '2.5.0'
 
   # JavaScript
 
diff --git a/Gemfile.lock b/Gemfile.lock
index a109606d5..6a0be6072 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -443,9 +443,9 @@ GEM
     typhoeus (0.6.8)
       ethon (>= 0.7.0)
     tzinfo (0.3.39)
-    uglifier (2.1.2)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
     unicorn (4.8.0)
       kgio (~> 2.6)
       rack
@@ -547,7 +547,7 @@ DEPENDENCIES
   timecop (= 0.7.1)
   twitter (= 4.8.1)
   typhoeus (= 0.6.8)
-  uglifier (= 2.1.2)
+  uglifier (= 2.5.0)
   unicorn (= 4.8.0)
   uuid (= 2.3.7)
   webmock (= 1.16.1)