tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gs-master

Browse Source 
Conflicts:
 	config/i18n-tasks.yml
This commit is contained in:
David Yip
2018-03-18 20:21:17 -05:00
parent 6a6f680d98 f02411da40
commit ab04be2f84
12 changed files with 51 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/i18n-tasks.yml
View File

@ -63,3 +63,4 @@ ignore_unused:
- 'admin.accounts.roles.*'
- 'admin.action_logs.actions.*'
- 'themes.default'
- 'statuses.attached.*'