mastodon/lib
Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
..
assets Add emoji autosuggest (#5053) 2017-09-23 14:47:32 +02:00
devise Fix wrong string being used on login failure when using LDAP (#8534) 2018-09-01 03:35:37 +02:00
generators Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
json_ld Preload common JSON-LD contexts (#9412) 2018-12-02 16:46:13 +01:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
paperclip Unconditionally re-encode locally-uploaded images to strip metadata 2018-09-17 21:09:59 +02:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2019-01-20 16:49:23 +01:00
templates Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
cli.rb Add `tootctl self-destruct` (#10367) 2019-03-28 17:56:25 +01:00