nyastodon/app
Thibaut Girka 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.
2019-05-26 15:41:40 +02: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-05-26 15:41:40 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-05-26 15:41:40 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-05-26 15:41:40 +02:00
mailers Fix error in AdminMailer#new_pending_account (#10264) 2019-03-14 14:20:22 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-05-26 15:41:40 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-05-26 15:41:40 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-05-18 10:04:32 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-05-26 15:41:40 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 19:01:30 +02:00