merging upstream changes

This commit is contained in:
Steven Verbeek 2012-03-24 00:36:54 -03:00
commit 6c40e89853
47 changed files with 383 additions and 146 deletions

View file

@ -0,0 +1,5 @@
class AddBioFieldToUser < ActiveRecord::Migration
def change
add_column :users, :bio, :string, :null => true
end
end