mastodon/app
Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
2018-09-11 16:51:26 +02:00
..
chewy
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
lib
mailers
models
policies
presenters
serializers
services Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
validators
views Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
workers