Merge commit '0beda737a3e080f116ff8c3b053304b1fed51d9b'

2014-03-31 17:41:44 +02:00
parent 34f296e6c3 0beda737a3
commit 9dd2576701
105 changed files with 990 additions and 379 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,3 @@
-GIT
-  remote: git://github.com/JangoSteve/remotipart.git
-  revision: aadc29e996c35096ee971bdc6cbf7ab148077a3a
-  specs:
-    remotipart (1.2.1)
-
 GIT
  remote: git://github.com/airblade/paper_trail.git
  revision: 802b7d4ead71703860fcb9befc2c9b2ee05a8b9f
@@ -86,6 +80,8 @@ GEM
      railties (>= 3.0.0)
    faraday (0.8.8)
      multipart-post (~> 1.2.0)
+    font-awesome-rails (4.0.3.1)
+      railties (>= 3.2, < 5.0)
    formtastic (2.2.1)
      actionpack (>= 3.0)
    formtastic-bootstrap (2.1.3)
@@ -245,6 +241,7 @@ DEPENDENCIES
  devise (~> 2.2.3)
  execjs (~> 1.4.0)
  factory_girl_rails
+  font-awesome-rails
  formtastic (~> 2.2.1)
  formtastic-bootstrap (~> 2.1.3)
  git