From c6c0ddeee581fc9a99d601d22661774c809c5c01 Mon Sep 17 00:00:00 2001
From: Dan Rice <dan@zoombody.com>
Date: Tue, 16 Sep 2014 12:40:40 -0400
Subject: [PATCH] Use main Tolk development branch

---
 Gemfile      |  2 +-
 Gemfile.lock | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index f0500485..2aad97d6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,7 @@ group :development do
 
   # tolk is not completly migrated to rails 4 yet, so use master of AlexStein
   # to get a working version 
-  gem 'tolk', github: "AlexStein/tolk" 
+  gem 'tolk', github: 'tolk', ref: '60a207c0de'
 
   gem "bullet"
   gem "rack-mini-profiler"
diff --git a/Gemfile.lock b/Gemfile.lock
index 77ca4e8f..44ca11f7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,11 @@
 GIT
-  remote: git://github.com/AlexStein/tolk.git
-  revision: 74c0e5d5d64958333821171a613b0c56f4ba5235
+  remote: git://github.com/tolk/tolk.git
+  revision: 60a207c0dee2717a3c9baf752f2044768cc653cc
+  ref: 60a207c0de
   specs:
-    tolk (1.5.1)
-      safe_yaml (>= 0.8)
+    tolk (1.5.2)
+      rails (>= 4.0, < 4.2)
+      safe_yaml (>= 0.8.6)
       will_paginate
 
 GEM