diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-05-15 14:05:47 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-05-15 14:05:47 +0100 |
| commit | 63793868f70cf05426730f95b8ba082a600da737 (patch) | |
| tree | 62588f53fe88c0d0c8745c56fb7d524d78df6655 /app/models/user.rb | |
| parent | 17d6aaa473ecac88b87a2618e4d523cc655c246f (diff) | |
| parent | c283668016311ecef09286202832b846ddee9999 (diff) | |
Merge branch 'hotfix/0.21.0.30' into rails-3-develop
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 1fb5d9139..bb40dbc26 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # == Schema Information # # Table name: users |