tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source 
Conflicts:
	app/controllers/authorize_follows_controller.rb
	app/javascript/styles/mastodon/components.scss
This commit is contained in:
David Yip
2018-01-02 00:11:41 -06:00
parent fa9b7ece2e 764f876953
commit 54148b9a4a
11 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/styles/mastodon/components.scss
View File

@ -1773,7 +1773,7 @@
}
> .mastodon {
background: url('~images/mastodon-drawer.png') no-repeat left bottom / contain;
background: url('~images/mastodon-ui.png') no-repeat left bottom / contain;
flex: 1;
}
}