1
0
puyopuyotetr.is/app/views/stream_entries
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
..
_detailed_status.html.haml Improve support for aspects/circles (#8950) 2018-10-17 17:13:04 +02:00
_og_description.html.haml Add description meta tag additionally to og:description (#8941) 2018-10-10 02:21:30 +02:00
_og_image.html.haml Add admin setting to enable OG previews for sensitive media (#7962) 2018-07-06 02:15:56 +02:00
_simple_status.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
_status.html.haml Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
embed.html.haml Add animate custom emoji param to embed pages (#8507) 2018-08-30 23:14:01 +02:00
show.html.haml Fix og:url on toots' public view (#9047) 2018-10-21 22:52:10 +02:00