mastodon/app
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
..
chewy Add type, limit, offset, min_id, max_id, account_id to search API (#10091) 2019-02-26 15:21:36 +01:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-02-26 17:04:44 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-02-26 17:04:44 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-02-26 17:04:44 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-02-17 15:43:12 +01:00
mailers Improve e-mail digest (#9689) 2019-01-02 10:47:32 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-02-26 17:04:44 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2018-11-29 19:22:52 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-02-17 12:26:55 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-02-26 17:04:44 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-02-12 20:32:48 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-02-19 20:18:40 +01:00
workers Filter incoming Create activities by relation to local activity (#10005) 2019-02-13 18:42:47 +01:00