mastodon/app/views/about
Thibaut Girka a84aedb7a7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
..
_domain_blocks.html.haml Fix long domain block descriptions breaking table layout (#12029) 2019-10-01 04:54:29 +02:00
_login.html.haml Fix duplicate HTML ids in /about (#11803) 2019-09-10 20:55:23 +02:00
_registration.html.haml Fix duplicate HTML ids in /about (#11803) 2019-09-10 20:55:23 +02:00
more.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
show.html.haml
terms.html.haml