Merge branch 'clean2'

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

1 files changed, 10 insertions, 0 deletions

diff --git a/db/migrate/20140429074422_add_attachments.mailboxer_engine.rb b/db/migrate/20140429074422_add_attachments.mailboxer_engine.rb
new file mode 100644
index 0000000..b8d6588
--- /dev/null
+++ b/db/migrate/20140429074422_add_attachments.mailboxer_engine.rb
@@ -0,0 +1,10 @@
+# This migration comes from mailboxer_engine (originally 20111204163911)
+class AddAttachments < ActiveRecord::Migration
+  def self.up
+    add_column :notifications, :attachment, :string
+  end
+
+  def self.down
+    remove_column :notifications, :attachment
+  end
+end