Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2021-03-15 11:26:59 +01:00
26 changed files with 83 additions and 88 deletions

View File

@@ -39,7 +39,7 @@
%tr
%th= t('exports.bookmarks')
%td= number_with_delimiter @export.total_bookmarks
%td= table_link_to 'download', t('bookmarks.csv'), settings_exports_bookmarks_path(format: :csv)
%td= table_link_to 'download', t('exports.csv'), settings_exports_bookmarks_path(format: :csv)
%hr.spacer/