tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
1cb3af21c5bb8f944a88c4e89ab28ff6b7e02552
Mastodon/app/javascript/styles/mastodon/components.scss
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

92 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink