diff options
| author | ThibG <thib@sitedethib.com> | 2018-06-22 00:10:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-22 00:10:43 +0200 |
| commit | 03cfe366fd0146cb4c3ede4dcdeeb2228a513e7d (patch) | |
| tree | 4ea4874b420a859b706b1187440e2ed103800396 /app/models/account.rb | |
| parent | f0161702d857a2f91d2e51469e8480253ffcd86e (diff) | |
| parent | 0c3a337e045dbd4b7be6ae6c3f07969b42f08857 (diff) | |
Merge pull request #550 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 48f284785..5099e4953 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -144,7 +144,7 @@ class Account < ApplicationRecord prefix: true, allow_nil: true - delegate :filtered_languages, to: :user, prefix: false, allow_nil: true + delegate :chosen_languages, to: :user, prefix: false, allow_nil: true def local? domain.nil? |