From: Tom Hughes <tom@compton.nu>
Date: Tue, 23 Apr 2013 21:40:21 +0000 (+0100)
Subject: Merge branch 'notes'
X-Git-Tag: live~5117
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0c8ad2f86edefed72052b402742cadedb0d674d9

Merge branch 'notes'

Conflicts:
	Vendorfile
---

0c8ad2f86edefed72052b402742cadedb0d674d9
diff --cc Vendorfile
index 43dd73fad,197bf575b..a56751196
--- a/Vendorfile
+++ b/Vendorfile
@@@ -26,9 -26,10 +26,16 @@@ folder 'vendor/assets' d
      end
    end
  
 +  folder 'jquery' do
 +    from 'git://github.com/jevin/Autogrow-Textarea.git' do
 +      file 'jquery.autogrowtextarea.js', 'jquery.autogrowtextarea.js'
++    end  
++  end
++
+   folder 'ohauth' do
+     from 'git://github.com/tmcw/ohauth.git' do
+       file 'ohauth.js'
+       file 'sha.js'
      end
    end
  end