diff options
author | David Yip <yipdw@member.fsf.org> | 2018-03-18 20:21:17 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-03-18 20:21:17 -0500 |
commit | ab04be2f84132e6b6a83ca86cbabf2cdf13f5894 (patch) | |
tree | 589ed30bd629a305a28eeb5a458fa0f83945eca3 /config/i18n-tasks.yml | |
parent | 6a6f680d98d114e3bb26e414ad7e3787a62bd129 (diff) | |
parent | f02411da404f730e3c05dc7dca1ac0f2d631315e (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: config/i18n-tasks.yml
Diffstat (limited to 'config/i18n-tasks.yml')
-rw-r--r-- | config/i18n-tasks.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 62e78556f..0236fb8cc 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -63,3 +63,4 @@ ignore_unused: - 'admin.accounts.roles.*' - 'admin.action_logs.actions.*' - 'themes.default' + - 'statuses.attached.*' |