From 49c01b0a3c31ea878bb8439eb3febc3c85dad66f Mon Sep 17 00:00:00 2001
From: Luka Murn <luka.murn@biosistemika.com>
Date: Thu, 26 Jan 2017 16:35:53 +0100
Subject: [PATCH] Update Gemfile.lock

---
 Gemfile.lock | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b9b15eba8..0a25cd26c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,14 +5,6 @@ GIT
     sneaky-save (0.1.1)
       activerecord (>= 3.2.0)
 
-GIT
-  remote: https://github.com/biosistemika/quill-rails.git
-  revision: e765c042d9ff7ec22f8c51a0e08e39e783530f8b
-  ref: e765c04
-  specs:
-    quill-rails (0.1.4)
-      railties (>= 3.1.0, < 5.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -79,6 +71,7 @@ GEM
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
+    base62 (1.0.0)
     bcrypt (3.1.11)
     better_errors (2.1.1)
       coderay (>= 1.0.0)
@@ -314,6 +307,8 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.1)
+    tinymce-rails (4.5.2)
+      railties (>= 3.1.1)
     turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)
@@ -347,6 +342,7 @@ DEPENDENCIES
   awesome_print
   aws-sdk (~> 2.2.8)
   aws-sdk-v1
+  base62
   bcrypt (~> 3.1.10)
   better_errors
   binding_of_caller
@@ -382,7 +378,6 @@ DEPENDENCIES
   paperclip (~> 4.3)
   pg
   puma
-  quill-rails!
   rails (= 4.2.5)
   rails_12factor
   rails_autolink (~> 1.1, >= 1.1.6)
@@ -392,6 +387,7 @@ DEPENDENCIES
   roo (~> 2.1.0)
   rubocop
   ruby-graphviz (~> 1.2)
+  rubyzip
   sass-rails (~> 5.0)
   scss_lint
   sdoc (~> 0.4.0)
@@ -402,6 +398,7 @@ DEPENDENCIES
   sneaky-save!
   spinjs-rails
   starscope
+  tinymce-rails
   turbolinks
   tzinfo-data
   uglifier (>= 1.3.0)