Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts: Gemfile.lock
2014-02-22 19:27:08 +01:00
parent 35941f0f72 fce30918a9
commit 14b42ef33a
48 changed files with 343 additions and 418 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,9 @@
+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