Merge branch 'clean2'

Conflicts:
	app/controllers/matches_controller.rb
	app/views/matches/index.html.erb
	app/views/matches/show.html.erb

1 files changed, 14 insertions, 0 deletions

diff --git a/db/migrate/20140429074421_add_notification_code.mailboxer_engine.rb b/db/migrate/20140429074421_add_notification_code.mailboxer_engine.rb
new file mode 100644
index 0000000..04c12ef
--- /dev/null
+++ b/db/migrate/20140429074421_add_notification_code.mailboxer_engine.rb
@@ -0,0 +1,14 @@
+# This migration comes from mailboxer_engine (originally 20110912163911)
+class AddNotificationCode < ActiveRecord::Migration
+  def self.up
+    change_table :notifications do |t|
+      t.string :notification_code, :default => nil
+    end
+  end
+
+  def self.down
+    change_table :notifications do |t|
+      t.remove :notification_code
+    end
+  end
+end
\ No newline at end of file