Merge branch 'stable' into develop

This commit is contained in:
Jonne Haß 2015-08-27 15:26:11 +02:00
commit d60a87ee85
2 changed files with 4 additions and 4 deletions

View file

@ -41,7 +41,7 @@ gem "sidetiq", "0.6.3"
# Compression
gem "uglifier", "2.7.1"
gem "uglifier", "2.7.2"
# Configuration

View file

@ -184,7 +184,7 @@ GEM
ffi (>= 1.3.0)
eventmachine (1.0.8)
excon (0.45.4)
execjs (2.5.2)
execjs (2.6.0)
eye (0.7.pre)
celluloid (~> 0.16.0)
celluloid-io (~> 0.16.0)
@ -755,7 +755,7 @@ GEM
ethon (>= 0.7.4)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
unf (0.1.4)
@ -911,7 +911,7 @@ DEPENDENCIES
twitter (= 5.14.0)
twitter-text (= 1.12.0)
typhoeus (= 0.7.2)
uglifier (= 2.7.1)
uglifier (= 2.7.2)
unicorn (= 4.9.0)
uuid (= 2.3.8)
webmock (= 1.21.0)