luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-14 01:15:16 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/accounts
History
Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
  Upstream moved account helpers to their own file, we had extra
  helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
..
_bio.html.haml Add Keybase integration (#10297) 2019-03-18 21:00:55 +01:00
_header.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-04-22 20:40:04 +02:00
_moved.html.haml Add noopener and/or noreferrer (#12202) 2019-10-24 22:44:42 +02:00
_og.html.haml
show.html.haml Add an RSS feed tagged to a public profile page (#10502) 2019-08-18 20:54:36 +02:00