diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-02 20:03:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-02 20:03:32 +0100 |
| commit | 0acd51acdc1e670bf57f58671cb8e30743782c63 (patch) | |
| tree | f5ff0b5c3b1e8fd94691264f2bc147e5fa233ecb /app/serializers | |
| parent | b300948526d967aaf5608c93546ee0d54940c0ef (diff) | |
| parent | e77ceb1b29547ed89b4110b3cc3edc9ac325b620 (diff) | |
Merge pull request #878 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/initial_state_serializer.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index 5b88cb9a8..19817e89e 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -22,6 +22,7 @@ class InitialStateSerializer < ActiveModel::Serializer version: Mastodon::Version.to_s, invites_enabled: Setting.min_invite_role == 'user', mascot: instance_presenter.mascot&.file&.url, + profile_directory: Setting.profile_directory, } if object.current_account |