Merge branch 'master' of github.com:spatil/dropzone_rails

Conflicts: .gitignore
spatil · Jul 30, 2013 · e3513ac · e3513ac
2 parents 4e302a7 + d145e5f
commit e3513ac
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,4 @@
+dropzone_rails
+==============
+
+Rails app using dropzone &amp; cloudinary