Merge branch 'notes'
authorTom Hughes <tom@compton.nu>
Tue, 23 Apr 2013 21:40:21 +0000 (22:40 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 23 Apr 2013 21:40:21 +0000 (22:40 +0100)
Conflicts:
Vendorfile

1  2 
Vendorfile
app/assets/stylesheets/common.css.scss

diff --cc 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