From adfb1381970672d37334a95ca3b5bacd4fb43b42 Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Tue, 22 Mar 2016 11:47:32 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into
 story/105855968-directo

# Conflicts:
#	Gemfile
#	Gemfile.lock
---
 Gemfile.lock | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 959f7a3c0..dbc1e8e3c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,15 +45,6 @@ GIT
       bundler (~> 1.2)
       thor (~> 0.18)
 
-GIT
-  remote: https://github.com/svenfuchs/rails-i18n.git
-  revision: 4913b54a5d7026066ceb12a4523476a1411e86bb
-  branch: rails-4-x
-  specs:
-    rails-i18n (4.0.8)
-      i18n (~> 0.7)
-      railties (~> 4.0)
-
 GEM
   remote: https://rubygems.org/
   specs: