masto-fe/app
Thibaut Girka 291012ec0c Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb

All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.
2019-03-18 18:03:27 +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-03-18 18:03:27 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01: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-03-18 18:03:27 +01: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-03-14 17:17:20 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-03-06 11:29:06 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-03-18 18:03:27 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 20:59:33 +01:00