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

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

Browse Source 
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our README.
This commit is contained in:
Claire
2022-03-15 20:45:27 +01:00
parent 80c4db160e e798c1c64c
commit c79a03b319
146 changed files with 1357 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/statuses/_simple_status.html.haml
View File

@ -8,7 +8,7 @@
= visibility_icon status
%time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
- if status.edited?
%abbr{ title: t('statuses.edited_at', date: l(status.edited_at.to_date)) }
%abbr{ title: t('statuses.edited_at_html', date: l(status.edited_at.to_date)) }
*
%data.dt-published{ value: status.created_at.to_time.iso8601 }