Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +02:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
features
fixtures	Export and import show_reblogs together with following list (#10495)	2019-04-08 07:28:27 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 21:19:21 +02:00
mailers	Add invite request to pending account notification e-mail (#10528)	2019-04-10 00:36:01 +02:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
policies
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
requests	Redesign landing page (#10232)	2019-03-12 17:34:00 +01:00
routing
serializers/activitypub
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
support
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00
workers
rails_helper.rb
spec_helper.rb