1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-11 21:29:17 +09:00
YuruToot/lib
Thibaut Girka 0158937fc2 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Dockerfile
  Took upstream version and reverted f13ebd02c9.
  Hopefuly it's not needed anymore.
- app/controllers/api/v1/search_controller.rb
  The conflict was due to us raising the number of results returned.
  Upstream raised it further, so took it.
- config/locales/de.yml
  Took upstream changes to theme translation strings.
- config/locales/gl.yml
  Took upstream changes to theme translation strings.
- config/locales/nl.yml
  Took upstream changes to theme translation strings.
- config/locales/sk.yml
  Took upstream changes to theme translation strings.
2019-02-26 17:04:44 +01: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-02-26 17:04:44 +01: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 --version (#9835) 2019-01-17 21:32:55 +01:00