tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
b21615e9579a6f33ed1cdf6fc37fc8a1ff24a0d5
Mastodon/config/application.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

2.8 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink