tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
cf142e85569be5e7e0dae7e02f490c737a238319
Mastodon/app/controllers/application_controller.rb
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

7.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink