Merge branch 'clean2'

Conflicts:
	app/models/pm.rb
	app/views/pms/index.html.erb
	app/views/pms/show.html.erb

1 files changed, 1 insertions, 1 deletions

diff --git a/generate.sh b/generate.sh
index be2e1a1..a81c0b3 100755
--- a/generate.sh
+++ b/generate.sh
@@ -43,7 +43,7 @@ bundle exec rails generate scaffold server default_user_permissions:integer
 bundle exec rails generate scaffold match status:integer tournament_stage:references winner:references remote_id:text submitted_peer_evaluations:integer
 bundle exec rails generate scaffold team
 bundle exec rails generate scaffold alert author:references message:text
-bundle exec rails generate scaffold pm author:references recipient:references message:text
+bundle exec rails generate scaffold pm author:references recipient:references message:text subject:text conversation:references
 bundle exec rails generate scaffold tournament game:references status:integer name:string:uniq min_players_per_team:integer max_players_per_team:integer min_teams_per_match:integer max_teams_per_match:integer set_rounds:integer randomized_teams:boolean sampling_method:string
 bundle exec rails generate scaffold game       parent:references              name:string:uniq min_players_per_team:integer max_players_per_team:integer min_teams_per_match:integer max_teams_per_match:integer set_rounds:integer randomized_teams:boolean sampling_method:string
 bundle exec rails generate scaffold user name:string email:string:uniq user_name:string:uniq