Merge branch 'szzh' into dev_hjq

Conflicts: app/views/projects/settings/_join_org.html.erb
10 years ago · b5ffdde1fe
parent 09659387e7 d133acbf2a
commit b5ffdde1fe
1 changed files with 0 additions and 5 deletions
--- a/db/migrate/20151116070906_add_created_at_to_org_members.rb
+++ b/db/migrate/20151116070906_add_created_at_to_org_members.rb
@ -1,5 +0,0 @@
-class AddCreatedAtToOrgMembers < ActiveRecord::Migration
-  def change
-    add_column :org_members, :created_at, :timestamp
-  end
-end