From 6af61b3477c9e918786acaaadcd04e84767f6d18 Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Sat, 22 Nov 2014 15:55:50 +0100
Subject: [PATCH] Bundle update

---
 Gemfile.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2544d164..67cd2ed0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: git://github.com/activeadmin/activeadmin.git
-  revision: 77adc9d56b414b373457b55908b548878967a073
+  revision: 0d7d6014568fe3cdd3e1eefd169285d25c717b94
   specs:
     activeadmin (1.0.0.pre)
       arbre (~> 1.0, >= 1.0.2)
       bourbon
       coffee-rails
-      formtastic (~> 3.0, < 3.1)
+      formtastic (~> 3.1)
       formtastic_i18n
       inherited_resources (~> 1.4, != 1.5.0)
       jquery-rails
@@ -146,7 +146,7 @@ GEM
     font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
     formatador (0.2.5)
-    formtastic (3.0.0)
+    formtastic (3.1.1)
       actionpack (>= 3.2.13)
     formtastic_i18n (0.1.1)
     geocoder (1.2.6)
@@ -234,7 +234,7 @@ GEM
     mysql2 (0.3.17)
     naught (1.0.0)
     orm_adapter (0.5.0)
-    parser (2.2.0.pre.7)
+    parser (2.2.0.pre.8)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     polyamorous (1.1.0)
@@ -308,7 +308,7 @@ GEM
     select2-rails (3.5.9.1)
       thor (~> 0.14)
     sexp_processor (4.4.4)
-    simple_calendar (1.1.8)
+    simple_calendar (1.1.9)
       rails (>= 3.0)
     simple_oauth (0.3.0)
     simplecov (0.9.1)