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
..
2017-05-08 15:56:00 +02:00
2017-09-19 03:27:08 +02:00
2018-01-28 22:48:09 +09:00
2018-01-22 14:20:58 +01:00
2017-12-08 01:59:44 +01:00
2017-04-21 19:15:25 +02:00
2018-01-18 07:00:23 +09:00
2018-01-28 22:48:09 +09:00
2018-01-27 08:51:03 +09:00
2018-02-01 07:33:54 +09:00
2017-05-08 15:56:00 +02:00
2018-01-28 22:48:09 +09:00
2017-12-08 01:59:44 +01:00
2018-01-28 22:48:09 +09:00
2018-01-09 20:30:28 +09:00
2018-05-03 19:12:09 +09:00