Merge branch 'develop'

1 files changed, 16 insertions, 0 deletions

diff --git a/db/migrate/20111122172513_create_conference_invitees.rb b/db/migrate/20111122172513_create_conference_invitees.rb
new file mode 100644
index 0000000..3ec293e
--- /dev/null
+++ b/db/migrate/20111122172513_create_conference_invitees.rb
@@ -0,0 +1,16 @@
+class CreateConferenceInvitees < ActiveRecord::Migration
+  def self.up
+    create_table :conference_invitees do |t|
+      t.integer :conference_id
+      t.integer :phone_book_entry_id
+      t.string :pin
+      t.boolean :speaker
+      t.boolean :moderator
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :conference_invitees
+  end
+end