From df43614f0086d28af97a3bc8712ea749c959f07d Mon Sep 17 00:00:00 2001
From: zmagod <zmago_devetak@yahoo.com>
Date: Thu, 10 Nov 2016 14:15:39 +0100
Subject: [PATCH] swithced quill gem to master branch

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

diff --git a/Gemfile b/Gemfile
index de95bba91..1f4a99a7f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -59,8 +59,7 @@ gem 'delayed_job_active_record'
 gem 'devise-async'
 gem 'ruby-graphviz', '~> 1.2' # Graphviz for rails
 gem 'quill-rails',
-    git: 'https://github.com/biosistemika/quill-rails.git',
-    branch: 'update_quill_version' # Rich text editor
+    git: 'https://github.com/biosistemika/quill-rails.git' # Rich text editor
 
 group :development, :test do
   gem 'byebug'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5d8d86cf3..4f16d3f42 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,6 @@
 GIT
   remote: https://github.com/biosistemika/quill-rails.git
-  revision: 425a8482396fde98de972ac0929c933eb09a8c1c
-  branch: update_quill_version
+  revision: a1ae9f8a59d42661f340437bc5f5951530628b15
   specs:
     quill-rails (0.1.4)
       railties (>= 3.1.0, < 5.0)