Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		2019-01-02 15:36:53 +01:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +01:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +01:00
features	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
fixtures	Ignore low-confidence CharlockHolmes guesses when parsing link cards (#9510)	2018-12-17 19:19:45 +01:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +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-01-02 15:36:53 +01:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-23 11:28:28 +01:00
presenters	Change instance_presenter_spec to point to glitch-soc instead of tootsuite	2018-12-23 11:45:26 +01:00
requests
routing
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +01:00
support
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +01:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-08 13:51:33 +02:00
workers
rails_helper.rb	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
spec_helper.rb